Implement cycle window forward/backward by keyboard shortcuts.

ui/aura_shell/shell_accelerator_controller.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shell_accelerator_controller.h"
 
 #include "base/logging.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura_shell/launcher/launcher.h"
+#include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/compositor/debug_utils.h"
 #include "ui/gfx/compositor/layer_animation_sequence.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/screen_rotation.h"
 
 namespace {
 
@@ skipping 20 matching lines @@
   { ui::VKEY_TAB, false, false, true, CYCLE_FORWARD },
   { ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
   { ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT },
 #if !defined(NDEBUG)
   { ui::VKEY_HOME, false, true, false, ROTATE_SCREEN },
   { ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
   { ui::VKEY_L, false, false, true, PRINT_LAYER_HIERARCHY },
 #endif
 };
 
-bool HandleCycleBackward() {
-  // TODO(mazda): http://crbug.com/105204
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool HandleCycleForward() {
-  // TODO(mazda): http://crbug.com/105204
-  NOTIMPLEMENTED();
-  return false;
+bool HandleCycleWindow(bool forward) {
+  // Use the same order of the windows in LauncherModel to cycle windows.
+  aura_shell::LauncherModel* model =
+      aura_shell::Shell::GetInstance()->launcher()->model();
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  int active_index = model->ItemIndexByWindow(root_window->active_window());
+  if (active_index < 0) {
+    LOG(ERROR) << "Active window not found";

[Ben Goodger (Google), 2011/12/07 17:13:00]

does this ever happen?

[mazda, 2011/12/09 15:09:46]

All the windows in the launcher model are contained in the default container, so
this happens when the other kind of window is active (i.e. modal window).
I changed LOG(ERROR) to VLOG(2) because I rethought these are not error cases.

+    return false;
+  }
+  int next_index = (active_index + (forward ? 1 : -1) + model->item_count()) %
+      model->item_count();
+  model->items()[next_index].window->Activate();
+  return true;
 }
 
 bool HandleTakeScreenshot() {
   // TODO(mazda): http://crbug.com/105198
   NOTIMPLEMENTED();
   return false;
 }
 
 #if !defined(NDEBUG)
 // Rotates the screen.
@@ skipping 89 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ShellAcceleratorController, ui::AcceleratorTarget implementation:
 
 bool ShellAcceleratorController::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   std::map<ui::Accelerator, int>::const_iterator it =
       accelerators_.find(accelerator);
   DCHECK(it != accelerators_.end());
   switch (static_cast<AcceleratorAction>(it->second)) {
     case CYCLE_BACKWARD:
-      return HandleCycleBackward();
+      return HandleCycleWindow(false);
     case CYCLE_FORWARD:
-      return HandleCycleForward();
+      return HandleCycleWindow(true);
     case TAKE_SCREENSHOT:
       return HandleTakeScreenshot();
 #if !defined(NDEBUG)
     case ROTATE_SCREEN:
       return HandleRotateScreen();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
     case PRINT_LAYER_HIERARCHY:
       return HandlePrintLayerHierarchy();
 #endif
     default:
       NOTREACHED() << "Unhandled action " << it->second;;
   }
   return false;
 }
 
 }  // namespace aura_shell