Use persistent ID/names for displays.

ash/display/display_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 15 matching lines @@
 DisplayController::DisplayController()
     : secondary_display_layout_(RIGHT),
       dont_warp_mouse_(false) {
   aura::Env::GetInstance()->display_manager()->AddObserver(this);
 }
 
 DisplayController::~DisplayController() {
   aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
   // Delete all root window controllers, which deletes root window
   // from the last so that the primary root window gets deleted last.
-  for (std::map<int, aura::RootWindow*>::const_reverse_iterator it =
+  for (std::map<int64, aura::RootWindow*>::const_reverse_iterator it =
            root_windows_.rbegin(); it != root_windows_.rend(); ++it) {
     internal::RootWindowController* controller =
         GetRootWindowController(it->second);
     // RootWindow may not have RootWindowController in non
     // extended desktop mode.
     if (controller)
       delete controller;
     else
       delete it->second;
   }
 }
 
 void DisplayController::InitPrimaryDisplay() {
   aura::DisplayManager* display_manager =
       aura::Env::GetInstance()->display_manager();
   const gfx::Display* display = display_manager->GetDisplayAt(0);
-  DCHECK_EQ(0, display->id());
-  aura::RootWindow* root = AddRootWindowForDisplay(*display);
+  aura::RootWindow* root = AddRootWindowForDisplay(*display, true);
   root->SetHostBounds(display->bounds_in_pixel());
 }
 
 void DisplayController::InitSecondaryDisplays() {
   aura::DisplayManager* display_manager =
       aura::Env::GetInstance()->display_manager();
   for (size_t i = 1; i < display_manager->GetNumDisplays(); ++i) {
     const gfx::Display* display = display_manager->GetDisplayAt(i);
-    aura::RootWindow* root = AddRootWindowForDisplay(*display);
+    aura::RootWindow* root = AddRootWindowForDisplay(*display, false);
     Shell::GetInstance()->InitRootWindowForSecondaryDisplay(root);
   }
   UpdateDisplayBoundsForLayout();
 }
 
 aura::RootWindow* DisplayController::GetPrimaryRootWindow() {
   DCHECK(!root_windows_.empty());
-  return root_windows_[0];
+  aura::DisplayManager* display_manager =
+      aura::Env::GetInstance()->display_manager();
+  return root_windows_[display_manager->GetDisplayAt(0)->id()];
 }
 
 aura::RootWindow* DisplayController::GetRootWindowForDisplayId(int id) {
   return root_windows_[id];
 }
 
 void DisplayController::CloseChildWindows() {
-  for (std::map<int, aura::RootWindow*>::const_iterator it =
+  for (std::map<int64, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     aura::RootWindow* root_window = it->second;
     internal::RootWindowController* controller =
         GetRootWindowController(root_window);
     if (controller) {
       controller->CloseChildWindows();
     } else {
       while (!root_window->children().empty()) {
         aura::Window* child = root_window->children()[0];
         delete child;
       }
     }
   }
 }
 
 std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
   std::vector<aura::RootWindow*> windows;
-  for (std::map<int, aura::RootWindow*>::const_iterator it =
+  for (std::map<int64, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     DCHECK(it->second);
     if (GetRootWindowController(it->second))
       windows.push_back(it->second);
   }
   return windows;
 }
 
 std::vector<internal::RootWindowController*>
 DisplayController::GetAllRootWindowControllers() {
   std::vector<internal::RootWindowController*> controllers;
-  for (std::map<int, aura::RootWindow*>::const_iterator it =
+  for (std::map<int64, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     internal::RootWindowController* controller =
         GetRootWindowController(it->second);
     if (controller)
       controllers.push_back(controller);
   }
   return controllers;
 }
 
 void DisplayController::SetSecondaryDisplayLayout(
@@ skipping 48 matching lines @@
   return false;
 }
 
 void DisplayController::OnDisplayBoundsChanged(const gfx::Display& display) {
   root_windows_[display.id()]->SetHostBounds(display.bounds_in_pixel());
   UpdateDisplayBoundsForLayout();
 }
 
 void DisplayController::OnDisplayAdded(const gfx::Display& display) {
   if (root_windows_.empty()) {
-    DCHECK_EQ(0, display.id());
     root_windows_[display.id()] = Shell::GetPrimaryRootWindow();
     Shell::GetPrimaryRootWindow()->SetHostBounds(display.bounds_in_pixel());
     return;
   }
-  aura::RootWindow* root = AddRootWindowForDisplay(display);
+  aura::RootWindow* root = AddRootWindowForDisplay(display, false);
   Shell::GetInstance()->InitRootWindowForSecondaryDisplay(root);
   UpdateDisplayBoundsForLayout();
 }
 
 void DisplayController::OnDisplayRemoved(const gfx::Display& display) {
   aura::RootWindow* root = root_windows_[display.id()];
   DCHECK(root);
   // Primary display should never be removed by DisplayManager.
   DCHECK(root != Shell::GetPrimaryRootWindow());
   // Display for root window will be deleted when the Primary RootWindow
@@ skipping 13 matching lines @@
 
 // static
 bool DisplayController::IsExtendedDesktopEnabled(){
   static bool extended_desktop_disabled =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshExtendedDesktopDisabled);
   return !extended_desktop_disabled;
 }
 
 aura::RootWindow* DisplayController::AddRootWindowForDisplay(
-    const gfx::Display& display) {
+    const gfx::Display& display, bool is_primary) {
   aura::RootWindow* root = aura::Env::GetInstance()->display_manager()->
       CreateRootWindowForDisplay(display);
   root_windows_[display.id()] = root;
   // Confine the cursor within the window if
   // 1) Extended desktop is enabled or
   // 2) the display is primary display and the host window
   // is set to be fullscreen (this is old behavior).
   if (IsExtendedDesktopEnabled() ||
-      (aura::DisplayManager::use_fullscreen_host_window() &&
-       display.id() == 0)) {
+      (aura::DisplayManager::use_fullscreen_host_window() && is_primary)) {
     root->ConfineCursorToWindow();
   }
   return root;
 }
 
 void DisplayController::UpdateDisplayBoundsForLayout() {
   if (!IsExtendedDesktopEnabled() || gfx::Screen::GetNumDisplays() <= 1) {
     return;
   }
   DCHECK_EQ(2, gfx::Screen::GetNumDisplays());
@@ skipping 20 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace internal
 }  // namespace ash