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"
@@ skipping 26 matching lines @@
 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)
     : widget_(widget),
       delegate_(delegate),
       focused_view_(NULL),
       accelerator_manager_(new ui::AcceleratorManager),
+      shortcut_handling_suspended_callback_(nullptr),
       focus_change_reason_(kReasonDirectFocusChange),
       is_changing_focus_(false) {
   DCHECK(widget_);
   stored_focused_view_storage_id_ =
       ViewStorage::GetInstance()->CreateStorageID();
 }
 
 FocusManager::~FocusManager() {
 }
 
@@ skipping 430 matching lines @@
   if (text_input_client && text_input_client->HasCompositionText()) {
     text_input_client->ConfirmCompositionText();
     ui::InputMethod* input_method = widget_->GetHostInputMethod();
     if (input_method && input_method->GetTextInputClient() == text_input_client)
       input_method->CancelComposition(text_input_client);
   }
   ui::TextInputFocusManager::GetInstance()->
       BlurTextInputClient(text_input_client);
 }
 
+void FocusManager::set_shortcut_handling_suspended_callback(
+    ReturnBoolCallback* callback) {
+  shortcut_handling_suspended_callback_ = callback;
+}
+
+bool FocusManager::shortcut_handling_suspended() const {
+  if (!shortcut_handling_suspended_callback_)

[Devlin, 2015/01/14 21:55:18]

nit: if this stays, it can be simplified to
return shortcut_handling_suspended_callback_ &&
    shortcut_handling_suspended_callback_->Run();

+    return false;
+  return shortcut_handling_suspended_callback_->Run();
+}
+
 // Find the next (previous if reverse is true) focusable view for the specified
 // FocusTraversable, starting at the specified view, traversing down the
 // FocusTraversable hierarchy.
 View* FocusManager::FindFocusableView(FocusTraversable* focus_traversable,
                                       View* starting_view,
                                       bool reverse) {
   FocusTraversable* new_focus_traversable = NULL;
   View* new_starting_view = NULL;
   View* v = focus_traversable->GetFocusSearch()->FindNextFocusableView(
       starting_view,
@@ skipping 91 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views