chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ash/common/shelf/wm_shelf_util.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

index 7b15862376b967c0d5ed6fb31bd762022a5d7741..7f6ef41cdfdf02a3fd684c33256c6dfcf5d9cff8 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -7,10 +7,10 @@

#include <stddef.h>

#include "ash/ash_switches.h"

+#include "ash/common/shelf/shelf_constants.h"

#include "ash/common/wm/window_state.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

-#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_model.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"