Multi-display support of some ash debugging commands.

ash/accelerators/accelerator_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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 138 matching lines @@
       case Shell::BACKWARD:
         shell->focus_cycler()->RotateFocus(internal::FocusCycler::BACKWARD);
         break;
     }
   }
   return true;
 }
 
 // Rotates the default window container.
 bool HandleRotateWindows() {
-  aura::Window* target =
-      Shell::GetPrimaryRootWindowController()->GetContainer(
-          internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
-      new ui::LayerAnimationSequence(new ash::ScreenRotation(360)));
-  target->layer()->GetAnimator()->StartAnimation(
-      screen_rotation.release());
+  Shell::RootWindowControllerList controllers =
+      Shell::GetAllRootWindowControllers();
+  for (size_t i = 0; i < controllers.size(); ++i) {
+    aura::Window* target = controllers[i]->GetContainer(
+        internal::kShellWindowId_DefaultContainer);
+    scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
+        new ui::LayerAnimationSequence(new ash::ScreenRotation(360)));
+    target->layer()->GetAnimator()->StartAnimation(
+        screen_rotation.release());
+  }
   return true;
 }
 
 // Rotates the screen.
 bool HandleRotateScreen() {
   static int i = 0;
   int delta = 0;
   switch (i) {
     case 0: delta = 90; break;
     case 1: delta = 90; break;
     case 2: delta = 90; break;
     case 3: delta = 90; break;
     case 4: delta = -90; break;
     case 5: delta = -90; break;
     case 6: delta = -90; break;
     case 7: delta = -90; break;
     case 8: delta = -90; break;
     case 9: delta = 180; break;
     case 10: delta = 180; break;
     case 11: delta = 90; break;
     case 12: delta = 180; break;
     case 13: delta = 180; break;
   }
   i = (i + 1) % 14;
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
-  root_window->layer()->GetAnimator()->
-      set_preemption_strategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
-  scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
-      new ui::LayerAnimationSequence(new ash::ScreenRotation(delta)));
-  screen_rotation->AddObserver(root_window);
-  root_window->layer()->GetAnimator()->
-      StartAnimation(screen_rotation.release());
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (size_t i = 0; i < root_windows.size(); ++i) {
+    aura::RootWindow* root_window = root_windows[i];
+    root_window->layer()->GetAnimator()->
+        set_preemption_strategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
+    scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
+        new ui::LayerAnimationSequence(new ash::ScreenRotation(delta)));
+    screen_rotation->AddObserver(root_window);
+    root_window->layer()->GetAnimator()->
+        StartAnimation(screen_rotation.release());
+  }
   return true;
 }
 
 bool HandleToggleDesktopBackgroundMode() {
   DesktopBackgroundController* desktop_background_controller =
       Shell::GetInstance()->desktop_background_controller();
   if (desktop_background_controller->desktop_background_mode() ==
       DesktopBackgroundController::BACKGROUND_IMAGE) {
     desktop_background_controller->SetDesktopBackgroundSolidColorMode(
         SK_ColorBLACK);
@@ skipping 22 matching lines @@
   int new_scale_index = std::max(0, std::min(8, scale_index + delta_index));
 
   ash::Shell::GetInstance()->magnification_controller()->
       SetScale(std::pow(kMagnificationFactor, new_scale_index), true);
 
   return true;
 }
 
 #if !defined(NDEBUG)
 bool HandlePrintLayerHierarchy() {
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
-  ui::PrintLayerHierarchy(root_window->layer(),
-                          root_window->GetLastMouseLocationInRoot());
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (size_t i = 0; i < root_windows.size(); ++i) {
+    ui::PrintLayerHierarchy(root_windows[i]->layer(),
+                            root_windows[i]->GetLastMouseLocationInRoot());
+  }
   return true;
 }
 
 bool HandlePrintViewHierarchy() {
   aura::Window* default_container =
       Shell::GetPrimaryRootWindowController()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
   if (default_container->children().empty())
     return true;
   aura::Window* browser_frame = default_container->children()[0];
   views::Widget* browser_widget =
       views::Widget::GetWidgetForNativeWindow(browser_frame);
   views::PrintViewHierarchy(browser_widget->GetRootView());
   return true;
 }
 
 void PrintWindowHierarchy(aura::Window* window, int indent) {
   std::string indent_str(indent, ' ');
   DLOG(INFO) << indent_str << window->name() << " type " << window->type()
       << (wm::IsActiveWindow(window) ? "active" : "");
   for (size_t i = 0; i < window->children().size(); ++i)
     PrintWindowHierarchy(window->children()[i], indent + 3);
 }
 
 bool HandlePrintWindowHierarchy() {
   DLOG(INFO) << "Window hierarchy:";
-  aura::Window* container =
-      Shell::GetPrimaryRootWindowController()->GetContainer(
-          internal::kShellWindowId_DefaultContainer);
-  PrintWindowHierarchy(container, 0);
+  Shell::RootWindowControllerList controllers =
+      Shell::GetAllRootWindowControllers();
+  for (size_t i = 0; i < controllers.size(); ++i) {
+    DLOG(INFO) << "RootWindow " << i << ":";
+    aura::Window* container = controllers[i]->GetContainer(
+        internal::kShellWindowId_DefaultContainer);
+    PrintWindowHierarchy(container, 0);
+  }
   return true;
 }
 
 #endif  // !defined(NDEBUG)
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
@@ skipping 463 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash