ash/app_list/app_list_presenter_delegate.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: ash/app_list/app_list_presenter_delegate.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:

Index: ash/app_list/app_list_presenter_delegate.cc

diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc

index f8c94450842d06eae0ba5d52735a3dc0eb0323fa..0bd692dd850906b7178db451fca4771d89fc4244 100644

--- a/ash/app_list/app_list_presenter_delegate.cc

+++ b/ash/app_list/app_list_presenter_delegate.cc

@@ -7,6 +7,8 @@

#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_layout_manager.h"

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

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

#include "ash/common/shell_window_ids.h"

@@ -19,8 +21,6 @@

#include "ash/display/window_tree_host_manager.h"

#include "ash/root_window_controller.h"

#include "ash/screen_util.h"

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

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

#include "ash/shell.h"

#include "base/command_line.h"

#include "ui/app_list/app_list_constants.h"

« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »