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

Unified Diff: ash/root_window_settings.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/root_window_controller.cc ('k') | ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_settings.cc
diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index 4d7dbc5839a9db35e281d7a3349d808f8eba6f21..a0fd29d1b965460cf21937ea11adde3d4aeca89f 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -6,7 +6,7 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_property.h"
-#include "ui/display/display.h"
+#include "ui/display/types/display_constants.h"
DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*);
@@ -17,7 +17,7 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
NULL);
RootWindowSettings::RootWindowSettings()
- : display_id(display::Display::kInvalidDisplayID), controller(NULL) {}
+ : display_id(display::kInvalidDisplayId), controller(NULL) {}
RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
RootWindowSettings* settings = new RootWindowSettings();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698