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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

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
« no previous file with comments | « ash/host/ash_window_tree_host_unified.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index d391a02696d0b9b12c779aa6e0f571ce470b1846..c3329123ac238a84417151d4eedaad92f518de87 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -68,7 +68,8 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
WmWindow* GetCaptureWindow() override;
WmWindow* GetPrimaryRootWindow() override;
WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
- const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;
+ const display::ManagedDisplayInfo& GetDisplayInfo(
+ int64_t display_id) const override;
bool IsActiveDisplayId(int64_t display_id) const override;
display::Display GetFirstDisplay() const override;
bool IsInUnifiedMode() const override;
« no previous file with comments | « ash/host/ash_window_tree_host_unified.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698