Reland "216874 - Use overview mode for alt-tab cycling."

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 <iostream>
 #include <string>
@@ skipping 76 matching lines @@
 }
 
 bool HandleCycleWindowMRU(WindowCycleController::Direction direction,
                           bool is_alt_down) {
   Shell::GetInstance()->
       window_cycle_controller()->HandleCycleWindow(direction, is_alt_down);
   // Always report we handled the key, even if the window didn't change.
   return true;
 }
 
+bool HandleCycleWindowOverviewMRU(WindowSelector::Direction direction) {
+  Shell::GetInstance()->
+      window_selector_controller()->HandleCycleWindow(direction);
+  return true;
+}
+
 void HandleCycleWindowLinear(CycleDirection direction) {
   Shell::GetInstance()->
       window_cycle_controller()->HandleLinearCycleWindow();
 }
 
 void ToggleOverviewMode() {
   Shell::GetInstance()->window_selector_controller()->ToggleOverview();
 }
 
 bool HandleAccessibleFocusCycle(bool reverse) {
@@ skipping 404 matching lines @@
   // function might be called *twice*, via BrowserView::PreHandleKeyboardEvent
   // and BrowserView::HandleKeyboardEvent, for a single accelerator press.
   switch (action) {
     case ACCESSIBLE_FOCUS_NEXT:
       return HandleAccessibleFocusCycle(false);
     case ACCESSIBLE_FOCUS_PREVIOUS:
       return HandleAccessibleFocusCycle(true);
     case CYCLE_BACKWARD_MRU:
       if (key_code == ui::VKEY_TAB)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_PREVWINDOW_TAB);
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kAshEnableOverviewMode)) {
+        return HandleCycleWindowOverviewMRU(WindowSelector::BACKWARD);
+      }
       return HandleCycleWindowMRU(WindowCycleController::BACKWARD,
                                   accelerator.IsAltDown());
     case CYCLE_FORWARD_MRU:
       if (key_code == ui::VKEY_TAB)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_NEXTWINDOW_TAB);
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kAshEnableOverviewMode)) {
+        return HandleCycleWindowOverviewMRU(WindowSelector::FORWARD);
+      }
       return HandleCycleWindowMRU(WindowCycleController::FORWARD,
                                   accelerator.IsAltDown());
     case CYCLE_BACKWARD_LINEAR:
       if (CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAshEnableOverviewMode)) {
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_OVERVIEW_F5);
         ToggleOverviewMode();
         return true;
       }
       if (key_code == ui::VKEY_MEDIA_LAUNCH_APP1)
@@ skipping 447 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash