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

Unified Diff: components/exo/wm_helper_mus.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
« no previous file with comments | « components/exo/wm_helper_mus.h ('k') | ui/display/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wm_helper_mus.cc
diff --git a/components/exo/wm_helper_mus.cc b/components/exo/wm_helper_mus.cc
index 33e6b0ee17130b4351db8cd5be2524195206a7c0..3f36dbd83ec68f54f9ce12c9990bc3d8e7b76f97 100644
--- a/components/exo/wm_helper_mus.cc
+++ b/components/exo/wm_helper_mus.cc
@@ -4,11 +4,11 @@
#include "components/exo/wm_helper_mus.h"
-#include "ash/common/display/display_info.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/views/mus/native_widget_mus.h"
#include "ui/views/mus/window_manager_connection.h"
#include "ui/views/widget/widget.h"
@@ -44,9 +44,10 @@ WMHelperMus::~WMHelperMus() {
////////////////////////////////////////////////////////////////////////////////
// WMHelperMus, private:
-const ash::DisplayInfo WMHelperMus::GetDisplayInfo(int64_t display_id) const {
+const display::ManagedDisplayInfo WMHelperMus::GetDisplayInfo(
+ int64_t display_id) const {
// TODO(penghuang): Return real display info when it is supported in mus.
- return ash::DisplayInfo(display_id, "", false);
+ return display::ManagedDisplayInfo(display_id, "", false);
}
aura::Window* WMHelperMus::GetContainer(int container_id) {
« no previous file with comments | « components/exo/wm_helper_mus.h ('k') | ui/display/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698