MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ash/accelerators/focus_manager_factory.cc

 // 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.
 
 #include "ash/accelerators/focus_manager_factory.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace ash {
 
 AshFocusManagerFactory::AshFocusManagerFactory() {}
 AshFocusManagerFactory::~AshFocusManagerFactory() {}
 
 views::FocusManager* AshFocusManagerFactory::CreateFocusManager(
     views::Widget* widget,
     bool desktop_widget) {
-  return new views::FocusManager(widget, desktop_widget ? NULL : new Delegate);
+  views::FocusManager* focus_manager = new views::FocusManager(widget);
+  if (!desktop_widget)
+    accelerator_processor_.reset(new AcceleratorProcessor(focus_manager));
+  return focus_manager;
 }
 
-bool AshFocusManagerFactory::Delegate::ProcessAccelerator(
+AshFocusManagerFactory::AcceleratorProcessor::AcceleratorProcessor(
+    views::FocusManager* focus_manager)
+    : focus_manager_(focus_manager) {
+  focus_manager_->AddAcceleratorPostProcessor(this);
+}
+
+AshFocusManagerFactory::AcceleratorProcessor::~AcceleratorProcessor() {
+}
+
+bool AshFocusManagerFactory::AcceleratorProcessor::ProcessAccelerator(
     const ui::Accelerator& accelerator) {
   AcceleratorController* controller =
       Shell::GetInstance()->accelerator_controller();
   if (controller)
     return controller->Process(accelerator);
   return false;
 }
 
 ui::AcceleratorTarget*
-AshFocusManagerFactory::Delegate::GetCurrentTargetForAccelerator(
+AshFocusManagerFactory::AcceleratorProcessor::GetTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
   AcceleratorController* controller =
       Shell::GetInstance()->accelerator_controller();
   if (controller && controller->IsRegistered(accelerator))
     return controller;
   return NULL;
 }
 
 }  // namespace ash