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..a5461b941c28da0cbf7660ab0e1a9b3b7affd203 100644
--- a/ash/accelerators/focus_manager_factory.h
+++ b/ash/accelerators/focus_manager_factory.h
@@ -7,32 +7,30 @@
 
 #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/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 {
+class AshFocusManagerFactory : public views::FocusManagerFactory,

[sky, 2015/01/08 23:39:25]

Having a class called FocusManagerFactory implement AcceleratorProcess is very
misleading. Can you follow a similar pattern to old and have the
AcceleratorProcess be implemented on a separate object that is handed to the
focus manager?

[Andre, 2015/01/09 00:06:15]

Done.
The asan builder was complaining that the object leaked, since the Delegate
object is never released
in the old pattern.

+                               public ui::AcceleratorProcessor {
  public:
   AshFocusManagerFactory();
   ~AshFocusManagerFactory() override;
 
+  // ui::AcceleratorProcessor overrides:
+  bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
+  ui::AcceleratorTarget* GetTargetForAccelerator(
+      const ui::Accelerator& accelerator) const override;
+
  protected:
   // views::FocusManagerFactory overrides:
   views::FocusManager* CreateFocusManager(views::Widget* widget,
                                           bool desktop_widget) override;
 
  private:
-  class Delegate : public views::FocusManagerDelegate {
-   public:
-    // views::FocusManagerDelegate overrides:
-    bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
-    ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
-        const ui::Accelerator& accelerator) const override;
-  };
-
   DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
 };