chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2268823002: mash: Move more shelf files 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_impl_browsertest.cc

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

Patch Set: Fix rebase. Created 4 years, 4 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.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_impl_browsertest.cc

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

index 28e70d80e697d054b64ce627d83913198bc66efb..040a3946e257646e3d0b6b47f01ef815267a4c9c 100644

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

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

@@ -9,15 +9,15 @@

#include "ash/aura/wm_window_aura.h"

#include "ash/common/ash_switches.h"

#include "ash/common/shelf/app_list_button.h"

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

#include "ash/common/shelf/shelf_button.h"

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

#include "ash/common/shelf/shelf_model.h"

#include "ash/common/shelf/shelf_view.h"

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

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

#include "ash/common/wm_shell.h"

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

#include "ash/shelf/shelf_util.h"

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

#include "ash/shell.h"

#include "ash/test/shelf_test_api.h"

#include "ash/test/shelf_view_test_api.h"