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

Unified Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 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/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 41fd5aab7f213ce7a299eb251e5f7550fbf99363..228143675e4fdddd30cd832dd8ab4500a10ac1b3 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -5,7 +5,6 @@
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/common/ash_switches.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
@@ -18,6 +17,7 @@
#include "chromeos/accelerometer/accelerometer_types.h"
#include "ui/chromeos/accelerometer/accelerometer_util.h"
#include "ui/display/display.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/gfx/geometry/size.h"
namespace ash {
@@ -39,7 +39,7 @@ blink::WebScreenOrientationLockType GetDisplayNaturalOrientation() {
if (!display::Display::HasInternalDisplay())
return blink::WebScreenOrientationLockLandscape;
- DisplayInfo info =
+ display::ManagedDisplayInfo info =
WmShell::Get()->GetDisplayInfo(display::Display::InternalDisplayId());
gfx::Size size = info.size_in_pixel();
switch (info.GetActiveRotation()) {
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/display/unified_mouse_warp_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698