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

Unified Diff: ash/root_window_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/mus/property_util.cc ('k') | ash/root_window_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index e702870b11cf47fe56d668f7d2f0bffd1e968a25..960c5ccfb66b2943601b0e1aca7e1e80048baec7 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -69,6 +69,7 @@
#include "ui/display/display.h"
#include "ui/display/manager/display_manager.h"
#include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
#include "ui/views/view_model.h"
@@ -211,8 +212,7 @@ void RootWindowController::Shutdown() {
GetRootWindowSettings(root_window)->controller = NULL;
// Forget with the display ID so that display lookup
// ends up with invalid display.
- GetRootWindowSettings(root_window)->display_id =
- display::Display::kInvalidDisplayID;
+ GetRootWindowSettings(root_window)->display_id = display::kInvalidDisplayId;
ash_host_->PrepareForShutdown();
system_wallpaper_.reset();
« no previous file with comments | « ash/mus/property_util.cc ('k') | ash/root_window_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698