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

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

index 1f6bea45df969802ca19184ab068ca4a8d8ef903..8c6a59e3b617f1c90055be4cd067b3d40a116c98 100644

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

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

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

#include <algorithm>

#include <cmath>

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

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

#include "ash/focus_cycler.h"

#include "ash/root_window_controller.h"

@@ -21,7 +22,6 @@

#include "ash/shelf/shelf_view.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

-#include "ash/shell_window_ids.h"

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

#include "ash/wm/window_properties.h"

#include "ui/aura/window.h"

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