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

Unified Diff: services/ui/public/cpp/lib/window_tree_client.cc

Issue 2161993002: Start using display.mojom.Display in mus+ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display_traits
Patch Set: Fixes. Created 4 years, 5 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 | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/lib/window_tree_client.cc
diff --git a/services/ui/public/cpp/lib/window_tree_client.cc b/services/ui/public/cpp/lib/window_tree_client.cc
index fcc0f985d9ebbaa6d647f57abc52a56bb8f4140f..b37771cc3fa49eb7e1a354429d7ac31ef27ba9fe 100644
--- a/services/ui/public/cpp/lib/window_tree_client.cc
+++ b/services/ui/public/cpp/lib/window_tree_client.cc
@@ -23,7 +23,6 @@
#include "services/ui/public/cpp/window_tree_client_delegate.h"
#include "services/ui/public/cpp/window_tree_client_observer.h"
#include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
-#include "ui/display/mojo/display_type_converters.h"
#include "ui/events/event.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size.h"
@@ -1086,11 +1085,10 @@ void WindowTreeClient::OnConnect(ClientSpecificId client_id) {
client_id_ = client_id;
}
-void WindowTreeClient::WmNewDisplayAdded(mojom::DisplayPtr display,
+void WindowTreeClient::WmNewDisplayAdded(const display::Display& display,
mojom::WindowDataPtr root_data,
bool parent_drawn) {
- WmNewDisplayAddedImpl(display.To<display::Display>(), std::move(root_data),
- parent_drawn);
+ WmNewDisplayAddedImpl(display, std::move(root_data), parent_drawn);
}
void WindowTreeClient::WmSetBounds(uint32_t change_id,
« no previous file with comments | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698