Remove --ash-disable-overview-mode

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index cae18ff1610cd0be419b554cd5bc8f4ed56cdf13..b9322abcccd28ce1a33a5975a4a2e91f0205c0a2 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -49,7 +49,6 @@
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/partial_screenshot_view.h"
 #include "ash/wm/power_button_controller.h"
-#include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
@@ -128,13 +127,8 @@ bool HandleCycleBackwardMRU(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_TAB)
     base::RecordAction(base::UserMetricsAction("Accel_PrevWindow_Tab"));
 
-  if (switches::UseOverviewMode()) {
-    shell->window_selector_controller()->HandleCycleWindow(
-        WindowSelector::BACKWARD);
-    return true;
-  }
-  shell->window_cycle_controller()->HandleCycleWindow(
-      WindowCycleController::BACKWARD, accelerator.IsAltDown());
+  shell->window_selector_controller()->HandleCycleWindow(

[oshima, 2014/02/27 23:36:10]

nit: can you just do 

Shell::GetInstance()->... 

and still fit the line?

same for the rest.

[flackr, 2014/02/28 15:37:34]

Done.

+      WindowSelector::BACKWARD);
   return true;
 }
 
@@ -144,29 +138,16 @@ bool HandleCycleForwardMRU(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_TAB)
     base::RecordAction(base::UserMetricsAction("Accel_NextWindow_Tab"));
 
-  if (switches::UseOverviewMode()) {
-    shell->window_selector_controller()->HandleCycleWindow(
-        WindowSelector::FORWARD);
-    return true;
-  }
-  shell->window_cycle_controller()->HandleCycleWindow(
-      WindowCycleController::FORWARD, accelerator.IsAltDown());
+  shell->window_selector_controller()->HandleCycleWindow(
+      WindowSelector::FORWARD);
   return true;
 }
 
-bool HandleCycleLinear(const ui::Accelerator& accelerator) {
+bool ToggleOverview(const ui::Accelerator& accelerator) {
   Shell* shell = Shell::GetInstance();
 
-  // TODO(jamescook): When overview becomes the default the AcceleratorAction
-  // should be renamed from CYCLE_LINEAR to TOGGLE_OVERVIEW.
-  if (switches::UseOverviewMode()) {
-    base::RecordAction(base::UserMetricsAction("Accel_Overview_F5"));
-    shell->window_selector_controller()->ToggleOverview();
-    return true;
-  }
-  if (accelerator.key_code() == ui::VKEY_MEDIA_LAUNCH_APP1)
-    base::RecordAction(base::UserMetricsAction("Accel_NextWindow_F5"));
-  shell->window_cycle_controller()->HandleLinearCycleWindow();
+  base::RecordAction(base::UserMetricsAction("Accel_Overview_F5"));
+  shell->window_selector_controller()->ToggleOverview();
   return true;
 }
 
@@ -936,8 +917,8 @@ bool AcceleratorController::PerformAction(int action,
       return HandleCycleBackwardMRU(accelerator);
     case CYCLE_FORWARD_MRU:
       return HandleCycleForwardMRU(accelerator);
-    case CYCLE_LINEAR:
-      return HandleCycleLinear(accelerator);
+    case TOGGLE_OVERVIEW:
+      return ToggleOverview(accelerator);
 #if defined(OS_CHROMEOS)
     case ADD_REMOVE_DISPLAY:
       return HandleAddRemoveDisplay();