MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ash/accelerators/focus_manager_factory.h

Index: ash/accelerators/focus_manager_factory.h
diff --git a/ash/accelerators/focus_manager_factory.h b/ash/accelerators/focus_manager_factory.h
index fc14151853dae300eb012e15d06e3dff3bc92b54..9f7af5a7c318f795535c0deb483585c58505e66b 100644
--- a/ash/accelerators/focus_manager_factory.h
+++ b/ash/accelerators/focus_manager_factory.h
@@ -7,7 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/views/focus/focus_manager_delegate.h"
+#include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/accelerator_processor.h"
 #include "ui/views/focus/focus_manager_factory.h"
 
 namespace ash {
@@ -25,14 +26,24 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {
                                           bool desktop_widget) override;
 
  private:
-  class Delegate : public views::FocusManagerDelegate {
+  class AcceleratorProcessor : public ui::AcceleratorProcessor {
    public:
-    // views::FocusManagerDelegate overrides:
+    AcceleratorProcessor(views::FocusManager* focus_manager);
+    ~AcceleratorProcessor() override;
+
+    // ui::AcceleratorProcessor overrides:
     bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
-    ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
+    ui::AcceleratorTarget* GetTargetForAccelerator(
         const ui::Accelerator& accelerator) const override;
+
+   private:
+    views::FocusManager* focus_manager_;  // Weak.
+
+    DISALLOW_COPY_AND_ASSIGN(AcceleratorProcessor);
   };
 
+  scoped_ptr<AcceleratorProcessor> accelerator_processor_;
+
   DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
 };