Add IsInternal property to gfx::Display

ash/display/display_manager.cc

Index: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index f46fd53491f6241dd0ea1bf1f8263f1a7bbcb0d3..d8197cd0da81e3d230b50f03924d9bd6170d8856 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -91,7 +91,6 @@ DEFINE_WINDOW_PROPERTY_KEY(int64, kDisplayIdKey,
                            gfx::Display::kInvalidDisplayID);
 
 DisplayManager::DisplayManager() :
-    internal_display_id_(gfx::Display::kInvalidDisplayID),
     force_bounds_changed_(false) {
   Init();
 }
@@ -119,11 +118,11 @@ bool DisplayManager::IsActiveDisplay(const gfx::Display& display) const {
 }
 
 bool DisplayManager::HasInternalDisplay() const {
-  return internal_display_id_ != gfx::Display::kInvalidDisplayID;
+  return gfx::Display::internal_display_id() != gfx::Display::kInvalidDisplayID;
 }
 
 bool DisplayManager::IsInternalDisplayId(int64 id) const {
-  return internal_display_id_ == id;
+  return gfx::Display::internal_display_id() == id;
 }
 
 bool DisplayManager::UpdateWorkAreaOfDisplayNearestWindow(
@@ -185,11 +184,11 @@ void DisplayManager::OnNativeDisplaysChanged(
     return;
   }
   DisplayList new_displays = updated_displays;
-  if (internal_display_id_ != gfx::Display::kInvalidDisplayID) {
+  if (HasInternalDisplay()) {
     bool internal_display_connected = false;
     for (DisplayList::const_iterator iter = updated_displays.begin();
          iter != updated_displays.end(); ++iter) {
-      if ((*iter).id() == internal_display_id_) {
+      if ((*iter).is_internal()) {
         internal_display_connected = true;
         // Update the internal display cache.
         internal_display_.reset(new gfx::Display);
@@ -201,8 +200,9 @@ void DisplayManager::OnNativeDisplaysChanged(
     if (!internal_display_connected) {
       // Internal display may be reported as disconnect during startup time.
       if (!internal_display_.get()) {
-        internal_display_.reset(new gfx::Display(internal_display_id_,
-                                                 gfx::Rect(800, 600)));
+        internal_display_.reset(
+            new gfx::Display(gfx::Display::internal_display_id(),
+                             gfx::Rect(800, 600)));
       }
       new_displays.push_back(*internal_display_.get());
     }
@@ -441,7 +441,8 @@ void DisplayManager::Init() {
     for (size_t i = 0; i < output_names.size(); ++i) {
       if (chromeos::OutputConfigurator::IsInternalOutputName(
               output_names[i])) {
-        internal_display_id_ = GetDisplayIdForOutput(outputs[i], i);
+        gfx::Display::set_internal_display_id(
+            GetDisplayIdForOutput(outputs[i], i));
         break;
       }
     }
@@ -530,10 +531,14 @@ void DisplayManager::AddDisplayFromSpec(const std::string& spec) {
 }
 
 int64 DisplayManager::SetFirstDisplayAsInternalDisplayForTest() {
-  internal_display_id_ = displays_[0].id();
+  gfx::Display::set_internal_display_id(displays_[0].id());
   internal_display_.reset(new gfx::Display);
   *internal_display_ = displays_[0];
-  return internal_display_id_;
+  return gfx::Display::internal_display_id();
+}
+
+void DisplayManager::ResetInternalDisplayForTest() {
+  gfx::Display::set_internal_display_id(gfx::Display::kInvalidDisplayID);
 }
 
 void DisplayManager::EnsurePointerInDisplays() {