ash/root_window_controller.cc - Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

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 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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/root_window_controller.cc

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

index c8429ae155401c09f5e1221b4327a357b1b3d59b..3d7a6e5685f1a5f360020b8058e30de5eea04da0 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -9,7 +9,7 @@

#include "ash/ash_switches.h"

#include "ash/desktop_background/desktop_background_widget_controller.h"

#include "ash/display/display_controller.h"

-#include "ash/display/multi_display_manager.h"

+#include "ash/display/display_manager.h"

#include "ash/focus_cycler.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"