ash/shelf/shelf_layout_manager.cc - Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common

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/shelf/shelf_layout_manager.cc

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common

Patch Set: add back static_assert Created 4 years, 7 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/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index ee6ed02b8726283f0c8d89e2bd956f7ce4c8e494..836587b12a52888f9d68a9b2e1bbd474acfbf495 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -12,6 +12,7 @@

#include "ash/accelerators/accelerator_commands.h"

#include "ash/ash_switches.h"

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

#include "ash/common/wm/shelf/wm_shelf_util.h"

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

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

@@ -27,7 +28,6 @@

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

-#include "ash/shell_window_ids.h"

#include "ash/system/status_area_widget.h"

#include "ash/wm/aura/wm_window_aura.h"

#include "ash/wm/gestures/shelf_gesture_handler.h"

« ash/common/shell_window_ids.h ('K') | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »