ash/root_window_controller.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/root_window_controller.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

Index: ash/root_window_controller.cc

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

index 1ce3d774cb384f608becf44b4ae8a9d79a7b59e2..e061b02bafd9e8298246cecb006914ba6d00b594 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -16,10 +16,14 @@

#include "ash/common/login_status.h"

#include "ash/common/root_window_controller_common.h"

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

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

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

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

#include "ash/common/shelf/shelf_types.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/status_area_layout_manager.h"

#include "ash/common/system/status_area_widget.h"

#include "ash/common/system/tray/system_tray_delegate.h"

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

@@ -39,9 +43,6 @@

#include "ash/high_contrast/high_contrast_controller.h"

#include "ash/host/ash_window_tree_host.h"

#include "ash/root_window_settings.h"

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

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

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

#include "ash/shelf/shelf_window_targeter.h"

#include "ash/shell.h"

#include "ash/touch/touch_hud_debug.h"

@@ -51,7 +52,6 @@

#include "ash/wm/panels/attached_panel_window_targeter.h"

#include "ash/wm/panels/panel_window_event_handler.h"

#include "ash/wm/stacking_controller.h"

-#include "ash/wm/status_area_layout_manager.h"

#include "ash/wm/system_background_controller.h"

#include "ash/wm/system_modal_container_layout_manager.h"

#include "ash/wm/window_properties.h"

« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/screen_util.cc » ('j') | no next file with comments »