Move common accelerator code from ash to ui/wm/core

ui/wm/core/accelerator_filter.h

Index: ui/wm/core/accelerator_filter.h
diff --git a/ash/accelerators/accelerator_filter.h b/ui/wm/core/accelerator_filter.h
similarity index 53%
rename from ash/accelerators/accelerator_filter.h
rename to ui/wm/core/accelerator_filter.h
index ab919f663d9acce345ed96776c84ba74a674d6dd..3f5253f4a7ad3f739c11b1678a794cbae161eed3 100644
--- a/ash/accelerators/accelerator_filter.h
+++ b/ui/wm/core/accelerator_filter.h
@@ -2,30 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
-#define ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
+#ifndef UI_WM_CORE_ACCELERATOR_FILTER_H_
+#define UI_WM_CORE_ACCELERATOR_FILTER_H_
 
-#include "ash/ash_export.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
+#include "ui/wm/wm_export.h"
 
-namespace ash {
+namespace wm {
+class AcceleratorDelegate;
 
 // AcceleratorFilter filters key events for AcceleratorControler handling global
 // keyboard accelerators.
-class ASH_EXPORT AcceleratorFilter : public ui::EventHandler {
+class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
  public:
-  AcceleratorFilter();
+  AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate);
   virtual ~AcceleratorFilter();
 
   // Overridden from ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
 
  private:
+  scoped_ptr<AcceleratorDelegate> delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
 };
 
-}  // namespace ash
+}  // namespace wm
 
-#endif  // ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
+#endif  // UI_WM_CORE_ACCELERATOR_FILTER_H_