commit bc319224de8c68b2584e3bcc99d0b309dd630aab
author kylechar <kylechar@chromium.org> Wed Nov 23 00:51:27 2016
committer Commit bot <commit-bot@chromium.org> Wed Nov 23 00:53:28 2016
tree e5db71abdb2eb044b3f1071f758ea92be62b7333
parent bd34059c71db23863c59f6abe7900afbe65903c1

Update display::Display::kInvalidDisplayID constant.

The constant was moved to ui/display/types/display_constants.h and is
now just display::kInvalidDisplayId. Update all references and delete
the old constant.

BUG=667344

Review-Url: https://codereview.chromium.org/2523723002
Cr-Commit-Position: refs/heads/master@{#434043}

ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index e702870..960c5cc 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 @@
   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();