Move processing out of AcceleratorDelegate

ash/accelerators/accelerator_delegate.h

Index: ash/accelerators/accelerator_delegate.h
diff --git a/ash/accelerators/accelerator_delegate.h b/ash/accelerators/accelerator_delegate.h
index 0614f873d9d8392c2ec9389c666d10cfbd8be0f8..18775a4a55480bbe178fd2a93635df6f564d6b18 100644
--- a/ash/accelerators/accelerator_delegate.h
+++ b/ash/accelerators/accelerator_delegate.h
@@ -5,6 +5,8 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_DELEGATE_H_
 #define ASH_ACCELERATORS_ACCELERATOR_DELEGATE_H_
 
+#include <memory>
+
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"

[James Cook, 2016/07/22 16:48:02]

nit: remove while you're here

[sky, 2016/07/22 17:05:06]

That one is needed because of NON_EXPORTED_BASE.

 #include "base/macros.h"
@@ -12,6 +14,8 @@
 
 namespace ash {
 
+class AcceleratorRouter;
+
 class ASH_EXPORT AcceleratorDelegate
     : NON_EXPORTED_BASE(public ::wm::AcceleratorDelegate) {
  public:
@@ -23,12 +27,7 @@ class ASH_EXPORT AcceleratorDelegate
                           const ui::Accelerator& accelerator) override;
 
  private:
-  // Returns true if the window should be allowed a chance to handle
-  // system keys.
-  bool CanConsumeSystemKeys(const ui::KeyEvent& event);
-
-  bool ShouldProcessAcceleratorNow(const ui::KeyEvent& event,
-                                   const ui::Accelerator& accelerator);
+  std::unique_ptr<AcceleratorRouter> router_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorDelegate);
 };