ash/shell.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/shell.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/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 1964e4ddc9bef3f4f4050f80b0623eaf421e1ea7..505e943e336ea8cda7d0bb667d8638340b9e2284 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -21,9 +21,11 @@

#include "ash/common/login_status.h"

#include "ash/common/session/session_state_delegate.h"

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

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

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

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

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

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

#include "ash/common/shell_delegate.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/locale/locale_notification_controller.h"

@@ -53,8 +55,6 @@

#include "ash/magnifier/magnification_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

#include "ash/root_window_controller.h"

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

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

#include "ash/shell_init_params.h"

#include "ash/utility/screenshot_controller.h"

#include "ash/wm/ash_focus_rules.h"

« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »