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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/exo/wayland/server.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build 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
« ash/host/ash_window_tree_host_unified.h ('K') | « components/exo/pointer.cc ('k') | components/exo/wm_helper.h » ('j') | ui/display/manager/managed_display_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 004f9d956fe9d7d420b5ec34c22244b25c01b14b..6f91d0c10d5068185ff8fa6f9fb26eca7280b432 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -27,7 +27,6 @@
#include <string>
#include <utility>
-#include "ash/common/display/display_info.h"
#include "ash/common/shell_observer.h"
#include "ash/common/shell_window_ids.h"
#include "ash/shell.h"
@@ -67,6 +66,7 @@
#include "ui/base/hit_test.h"
#include "ui/compositor/compositor_vsync_manager.h"
#include "ui/display/display_observer.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/gfx/buffer_format_util.h"
@@ -1074,7 +1074,7 @@ class WaylandPrimaryDisplayObserver : public display::DisplayObserver {
display::Display display =
display::Screen::GetScreen()->GetPrimaryDisplay();
- const ash::DisplayInfo& info =
+ const ui::ManagedDisplayInfo& info =
WMHelper::GetInstance()->GetDisplayInfo(display.id());
const float kInchInMm = 25.4f;
« ash/host/ash_window_tree_host_unified.h ('K') | « components/exo/pointer.cc ('k') | components/exo/wm_helper.h » ('j') | ui/display/manager/managed_display_info.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698