MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ash/accelerators/focus_manager_factory.h

 // 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_FOCUS_MANAGER_FACTORY_H_
 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
 
 #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 {
 
 // A factory class for creating a custom views::FocusManager object which
 // supports Ash shortcuts.
 class AshFocusManagerFactory : public views::FocusManagerFactory {
  public:
   AshFocusManagerFactory();
   ~AshFocusManagerFactory() override;
 
  protected:
   // views::FocusManagerFactory overrides:
   views::FocusManager* CreateFocusManager(views::Widget* widget,
                                           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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_