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

Unified Diff: services/ui/ws/window_tree.cc

Issue 2189893004: Unify display ids between Display and PlatformDisplay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to pure virtual. 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/ws/user_display_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 461c9274059fb5a74442d3db6071fffdc8bc9601..fb500d96ed2be8e87e0f6c59522419159fa153dc 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -100,7 +100,7 @@ void WindowTree::Init(std::unique_ptr<WindowTreeBinding> binding,
Display* display = GetDisplay(root);
int64_t display_id =
- display ? display->id() : display::Display::kInvalidDisplayID;
+ display ? display->GetId() : display::Display::kInvalidDisplayID;
const ServerWindow* focused_window =
display ? display->GetFocusedWindow() : nullptr;
if (focused_window)
@@ -413,7 +413,7 @@ void WindowTree::OnWindowManagerCreatedTopLevelWindow(
roots_.insert(window);
Display* display = GetDisplay(window);
int64_t display_id =
- display ? display->id() : display::Display::kInvalidDisplayID;
+ display ? display->GetId() : display::Display::kInvalidDisplayID;
const bool drawn = window->parent() && window->parent()->IsDrawn();
client()->OnTopLevelCreated(client_change_id, WindowToWindowData(window),
display_id, drawn);
« no previous file with comments | « services/ui/ws/user_display_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698