ash/display/display_configuration_controller.cc - Issue 2445583002: Relocate display_manager from ash to ui

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/display/display_configuration_controller.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)

Patch Set: fix windows build Created 4 years, 2 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/display/display_configuration_controller.cc

diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc

index 2a989cbc9e593d4297f30b8f70282656250a8798..5184530f6620e42ebd8b819e1225ccacd146df45 100644

--- a/ash/display/display_configuration_controller.cc

+++ b/ash/display/display_configuration_controller.cc

@@ -5,11 +5,11 @@

#include "ash/display/display_configuration_controller.h"

#include "ash/display/display_animator.h"

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

#include "ash/display/display_util.h"

#include "ash/rotator/screen_rotation_animator.h"

#include "base/time/time.h"

#include "ui/display/manager/display_layout.h"

+#include "ui/display/manager/display_manager.h"

#if defined(OS_CHROMEOS)

#include "ash/display/display_animator_chromeos.h"

@@ -51,7 +51,7 @@ class DisplayConfigurationController::DisplayChangeLimiter {

};

DisplayConfigurationController::DisplayConfigurationController(

- DisplayManager* display_manager,

+ display::DisplayManager* display_manager,

WindowTreeHostManager* window_tree_host_manager)

: display_manager_(display_manager),

window_tree_host_manager_(window_tree_host_manager),

« no previous file with comments | « ash/display/display_configuration_controller.h ('k') | ash/display/display_manager.h » ('j') | no next file with comments »