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

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

Issue 2523723002: Update display::Display::kInvalidDisplayID constant. (Closed)
Patch Set: Fix includes. Created 4 years, 1 month 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') | ui/display/display.h » ('j') | 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 8089988e2b745d814e311f675966806b18d67e55..9a4f45396199497ddd63c206f5b617c29a44d745 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -28,6 +28,7 @@
#include "services/ui/ws/window_server.h"
#include "services/ui/ws/window_tree_binding.h"
#include "ui/display/display.h"
+#include "ui/display/types/display_constants.h"
#include "ui/platform_window/mojo/ime_type_converters.h"
#include "ui/platform_window/text_input_state.h"
@@ -104,8 +105,7 @@ void WindowTree::Init(std::unique_ptr<WindowTreeBinding> binding,
GetUnknownWindowsFrom(root, &to_send);
Display* display = GetDisplay(root);
- int64_t display_id =
- display ? display->GetId() : display::Display::kInvalidDisplayID;
+ int64_t display_id = display ? display->GetId() : display::kInvalidDisplayId;
const ServerWindow* focused_window =
display ? display->GetFocusedWindow() : nullptr;
if (focused_window)
@@ -469,8 +469,7 @@ void WindowTree::OnWindowManagerCreatedTopLevelWindow(
waiting_for_top_level_window_info->client_window_id;
roots_.insert(window);
Display* display = GetDisplay(window);
- int64_t display_id =
- display ? display->GetId() : display::Display::kInvalidDisplayID;
+ int64_t display_id = display ? display->GetId() : 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') | ui/display/display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698