Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« ash/display/mouse_cursor_event_filter.cc ('K') | « ash/display/screen_ash_unittest.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | ash/display/unified_mouse_warp_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_orientation_controller_chromeos.cc
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc
index df403ae66f19b6da8269e90dfaf31cfc4673e3a2..45c8bcd0e2a3ffca688edac6fc44d6bf4c87ecaa 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -9,7 +9,6 @@
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/display_configuration_controller.h"
-#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
@@ -17,6 +16,7 @@
#include "chromeos/accelerometer/accelerometer_types.h"
#include "ui/chromeos/accelerometer/accelerometer_util.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/managed_display_info.h"
#include "ui/gfx/geometry/size.h"
@@ -377,7 +377,8 @@ void ScreenOrientationController::HandleScreenRotation(
}
void ScreenOrientationController::LoadDisplayRotationProperties() {
- DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+ display::DisplayManager* display_manager =
+ Shell::GetInstance()->display_manager();
if (!display_manager->registered_internal_display_rotation_lock())
return;
SetDisplayRotation(display_manager->registered_internal_display_rotation(),
« ash/display/mouse_cursor_event_filter.cc ('K') | « ash/display/screen_ash_unittest.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | ash/display/unified_mouse_warp_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698