Revert 272740 "Refactor and move ash independent accelerator han..."

trunk/src/ash/shell.cc

Index: trunk/src/ash/shell.cc
===================================================================
--- trunk/src/ash/shell.cc	(revision 272758)
+++ trunk/src/ash/shell.cc	(working copy)
@@ -10,7 +10,7 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/focus_manager_factory.h"
-#include "ash/accelerators/nested_accelerator_delegate.h"
+#include "ash/accelerators/nested_dispatcher_controller.h"
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/autoclick/autoclick_controller.h"
@@ -108,7 +108,6 @@
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/input_method_event_filter.h"
-#include "ui/wm/core/nested_accelerator_controller.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/user_activity_detector.h"
 #include "ui/wm/core/visibility_controller.h"
@@ -754,7 +753,7 @@
   partial_magnification_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
-  nested_accelerator_controller_.reset();
+  nested_dispatcher_controller_.reset();
   toplevel_window_event_handler_.reset();
   visibility_controller_.reset();
   // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be
@@ -880,8 +879,7 @@
 
   cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay());
 
-  nested_accelerator_controller_.reset(
-      new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate));
+  nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
   maximize_mode_controller_.reset(new MaximizeModeController());
 
@@ -1094,9 +1092,9 @@
   root_window->AddPreTargetHandler(toplevel_window_event_handler_.get());
   root_window->AddPostTargetHandler(toplevel_window_event_handler_.get());
 
-  if (nested_accelerator_controller_) {
+  if (nested_dispatcher_controller_) {
     aura::client::SetDispatcherClient(root_window,
-                                      nested_accelerator_controller_.get());
+                                      nested_dispatcher_controller_.get());
   }
 }