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

Unified Diff: ash/display/extended_mouse_warp_controller.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 | « ash/display/display_manager_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/extended_mouse_warp_controller.cc
diff --git a/ash/display/extended_mouse_warp_controller.cc b/ash/display/extended_mouse_warp_controller.cc
index 9e2a9df79cc55dd1925c4d8d644386ca7222bf69..12bd079c0eaaf0987924cf68b5b4226711313d1c 100644
--- a/ash/display/extended_mouse_warp_controller.cc
+++ b/ash/display/extended_mouse_warp_controller.cc
@@ -17,6 +17,7 @@
#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
#include "ui/events/event_utils.h"
#include "ui/wm/core/coordinate_conversion.h"
@@ -103,7 +104,7 @@ ExtendedMouseWarpController::ExtendedMouseWarpController(
display::DisplayManager* display_manager =
Shell::GetInstance()->display_manager();
int64_t drag_source_id = drag_source ? GetDisplayIdFromWindow(drag_source)
- : display::Display::kInvalidDisplayID;
+ : display::kInvalidDisplayId;
display::Displays display_list = display_manager->active_display_list();
// Try to create a Warp region for all possible two displays combination.
// The following code does it by poping the last element in the list
@@ -205,9 +206,8 @@ ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a,
int64_t drag_source_id) {
gfx::Rect a_edge;
gfx::Rect b_edge;
- int snap_barrier = drag_source_id == display::Display::kInvalidDisplayID
- ? 0
- : kMaximumSnapHeight;
+ int snap_barrier =
+ drag_source_id == display::kInvalidDisplayId ? 0 : kMaximumSnapHeight;
if (!display::ComputeBoundary(a, b, &a_edge, &b_edge))
return nullptr;
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698