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

Unified Diff: ash/display/screen_ash.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/extended_mouse_warp_controller.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index 70dd5a82a7b02bb5c836806983dba350c396ce27..f37d756ef1d96d856b371ecafaf74f7732d4c5da 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -19,6 +19,7 @@
#include "ui/display/display_finder.h"
#include "ui/display/manager/display_manager.h"
#include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
namespace ash {
@@ -124,8 +125,8 @@ display::Display ScreenAsh::GetDisplayNearestWindow(
const RootWindowSettings* rws = GetRootWindowSettings(root_window);
int64_t id = rws->display_id;
// if id is |kInvaildDisplayID|, it's being deleted.
- DCHECK(id != display::Display::kInvalidDisplayID);
- if (id == display::Display::kInvalidDisplayID)
+ DCHECK(id != display::kInvalidDisplayId);
+ if (id == display::kInvalidDisplayId)
return GetPrimaryDisplay();
display::DisplayManager* display_manager = GetDisplayManager();
« no previous file with comments | « ash/display/extended_mouse_warp_controller.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698