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

trunk/src/ash/shell.h

Index: trunk/src/ash/shell.h
===================================================================
--- trunk/src/ash/shell.h	(revision 272758)
+++ trunk/src/ash/shell.h	(working copy)
@@ -64,7 +64,6 @@
 namespace wm {
 class CompoundEventFilter;
 class InputMethodEventFilter;
-class NestedAcceleratorController;
 class ShadowController;
 class VisibilityController;
 class UserActivityDetector;
@@ -107,6 +106,7 @@
 class MediaDelegate;
 class MouseCursorEventFilter;
 class MruWindowTracker;
+class NestedDispatcherController;
 class NewWindowDelegate;
 class OverlayEventFilter;
 class PartialMagnificationController;
@@ -623,7 +623,7 @@
   std::vector<WindowAndBoundsPair> to_restore_;
 
   scoped_ptr<UserMetricsRecorder> user_metrics_recorder_;
-  scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_;
+  scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
   scoped_ptr<AcceleratorController> accelerator_controller_;
   scoped_ptr<ShellDelegate> delegate_;
   scoped_ptr<SystemTrayDelegate> system_tray_delegate_;