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

ui/wm/core/nested_accelerator_controller.h

Index: ui/wm/core/nested_accelerator_controller.h
diff --git a/ash/accelerators/nested_dispatcher_controller.h b/ui/wm/core/nested_accelerator_controller.h
similarity index 50%
rename from ash/accelerators/nested_dispatcher_controller.h
rename to ui/wm/core/nested_accelerator_controller.h
index 7311c9e367951f0787a58eb28a03b795a3c3c3d7..13b4a4bf7c3ac49958514119032af88d4f192adb 100644
--- a/ash/accelerators/nested_dispatcher_controller.h
+++ b/ui/wm/core/nested_accelerator_controller.h
@@ -1,28 +1,29 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
-#define ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
+#ifndef UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_
+#define UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_
 
-#include "ash/ash_export.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/wm/public/dispatcher_client.h"
+#include "ui/wm/wm_export.h"
 
-namespace ash {
+namespace wm {
 
-class AcceleratorDispatcher;
+class NestedAcceleratorDelegate;
+class NestedAcceleratorDispatcher;
 
 // Creates a dispatcher which wraps another dispatcher.
 // The outer dispatcher runs first and performs ash specific handling.
 // If it does not consume the event it forwards the event to the nested
 // dispatcher.
-class ASH_EXPORT NestedDispatcherController
+class WM_EXPORT NestedAcceleratorController
     : public aura::client::DispatcherClient {
  public:
-  NestedDispatcherController();
-  virtual ~NestedDispatcherController();
+  explicit NestedAcceleratorController(NestedAcceleratorDelegate* delegate);
+  virtual ~NestedAcceleratorController();
 
   // aura::client::DispatcherClient:
   virtual void RunWithDispatcher(
@@ -31,11 +32,12 @@ class ASH_EXPORT NestedDispatcherController
 
  private:
   base::Closure quit_closure_;
-  scoped_ptr<AcceleratorDispatcher> accelerator_dispatcher_;
+  scoped_ptr<NestedAcceleratorDispatcher> accelerator_dispatcher_;
+  scoped_ptr<NestedAcceleratorDelegate> dispatcher_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(NestedDispatcherController);
+  DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorController);
 };
 
-}  // namespace ash
+}  // namespace wm
 
-#endif  // ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
+#endif  // UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_