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

Unified Diff: ash/display/root_window_transformers.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:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/root_window_transformers.cc
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc
index add883ad4d2e7ade0f5776f8a463dfef03314abe..03b77f12ceebd84b57c106a85f8b2d0434401f2c 100644
--- a/ash/display/root_window_transformers.cc
+++ b/ash/display/root_window_transformers.cc
@@ -7,7 +7,6 @@
#include <cmath>
#include "ash/common/ash_switches.h"
-#include "ash/display/display_manager.h"
#include "ash/host/root_window_transformer.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/shell.h"
@@ -17,6 +16,7 @@
#include "ui/aura/window_property.h"
#include "ui/compositor/dip_util.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/insets.h"
@@ -138,7 +138,8 @@ class AshRootWindowTransformer : public RootWindowTransformer {
public:
AshRootWindowTransformer(aura::Window* root, const display::Display& display)
: root_window_(root) {
- DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+ display::DisplayManager* display_manager =
+ Shell::GetInstance()->display_manager();
display::ManagedDisplayInfo info =
display_manager->GetDisplayInfo(display.id());
host_insets_ = info.GetOverscanInsetsInPixel();
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698