Revert of Refactor and move ash independent nested accelerator code to ui/wm/core

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 354d653c7aa14ffa557d81fd467d1eaea80d2341..e889131b95beca21793ddde3e57a98c6cf693080 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -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_;