MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ui/views/focus/focus_manager.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 "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace views {
 
 namespace {
 
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
 static const int kEventFlagsMask = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
                                    ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN;
 #else
 static const int kEventFlagsMask = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
                                    ui::EF_ALT_DOWN;
 #endif
 
 static inline int CalculateModifiers(const ui::KeyEvent& event) {
   return event.flags() & kEventFlagsMask;
 }
 
 }  // namespace
 
-bool FocusManager::shortcut_handling_suspended_ = false;
 bool FocusManager::arrow_key_traversal_enabled_ = false;
 
-FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)
+FocusManager::FocusManager(Widget* widget)
     : widget_(widget),
-      delegate_(delegate),
       focused_view_(NULL),
       accelerator_manager_(new ui::AcceleratorManager),
       focus_change_reason_(kReasonDirectFocusChange),
       is_changing_focus_(false) {
   DCHECK(widget_);
   stored_focused_view_storage_id_ =
       ViewStorage::GetInstance()->CreateStorageID();
+  accelerator_processors_.push_back(accelerator_manager_.get());
 }
 
 FocusManager::~FocusManager() {
 }
 
 bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) {
   const int key_code = event.key_code();
 
   if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED)
     return false;
 
-  if (shortcut_handling_suspended())
-    return true;
-
   int modifiers = CalculateModifiers(event);
   ui::Accelerator accelerator(event.key_code(), modifiers);
   accelerator.set_type(event.type());
   accelerator.set_is_repeat(event.IsRepeat());
 
   if (event.type() == ui::ET_KEY_PRESSED) {
     // If the focused view wants to process the key event as is, let it be.
     if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
         !accelerator_manager_->HasPriorityHandler(accelerator))
       return true;
@@ skipping 461 matching lines @@
 void FocusManager::UnregisterAccelerator(const ui::Accelerator& accelerator,
                                          ui::AcceleratorTarget* target) {
   accelerator_manager_->Unregister(accelerator, target);
 }
 
 void FocusManager::UnregisterAccelerators(ui::AcceleratorTarget* target) {
   accelerator_manager_->UnregisterAll(target);
 }
 
 bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) {
-  if (accelerator_manager_->Process(accelerator))
-    return true;
-  if (delegate_.get())
-    return delegate_->ProcessAccelerator(accelerator);
+  for (ui::AcceleratorProcessor* processor : accelerator_processors_) {
+    if (processor->ProcessAccelerator(accelerator))
+      return true;
+  }
   return false;
 }
 
-ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
+ui::AcceleratorTarget* FocusManager::GetTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
-  ui::AcceleratorTarget* target =
-      accelerator_manager_->GetCurrentTarget(accelerator);
-  if (!target && delegate_.get())
-    target = delegate_->GetCurrentTargetForAccelerator(accelerator);
+  ui::AcceleratorTarget* target = nullptr;
+  for (ui::AcceleratorProcessor* processor : accelerator_processors_) {
+    target = processor->GetTargetForAccelerator(accelerator);
+    if (target)
+      break;

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

nit: make this return target and move 559 into for loop.

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

Done.

+  }
   return target;
 }
 
+void FocusManager::AddAcceleratorPreProcessor(
+    ui::AcceleratorProcessor* processor) {
+  accelerator_processors_.push_front(processor);
+}
+
+void FocusManager::AddAcceleratorPostProcessor(
+    ui::AcceleratorProcessor* processor) {
+  accelerator_processors_.push_back(processor);
+}
+
+void FocusManager::RemoveAcceleratorProcessor(
+    ui::AcceleratorProcessor* processor) {
+  accelerator_processors_.remove(processor);
+}
+
 bool FocusManager::HasPriorityHandler(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->HasPriorityHandler(accelerator);
 }
 
 // static
 bool FocusManager::IsTabTraversalKeyEvent(const ui::KeyEvent& key_event) {
   return key_event.key_code() == ui::VKEY_TAB && !key_event.IsControlDown();
 }
 
@@ skipping 25 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views