MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ui/views/focus/focus_manager.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 UI_VIEWS_FOCUS_FOCUS_MANAGER_H_
 #define UI_VIEWS_FOCUS_FOCUS_MANAGER_H_
 
 #include <list>
 #include <map>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
 // focused views and handle keyboard accelerators.
 //
@@ skipping 196 matching lines @@
 
   // Changes the text input focus to |view->GetTextInputClient()| iff |view|
   // is focused.  Views must call this method when their internal
   // TextInputClient instance changes.
   void OnTextInputClientChanged(View* view);
 
   // Moves the text input focus into/out from |view|.
   void FocusTextInputClient(View* view);
   void BlurTextInputClient(View* view);
 
-  // Disable shortcut handling.
-  static void set_shortcut_handling_suspended(bool suspended) {
-    shortcut_handling_suspended_ = suspended;
-  }
+  // Installs a callback to control whether to disable shortcut handling.
+  // Accelerator processing is skipped if |callback| returns true.
+  typedef base::Callback<bool()> ReturnBoolCallback;
+  void set_shortcut_handling_suspended_callback(ReturnBoolCallback* callback);
+
   // Returns whether shortcut handling is currently suspended.
-  bool shortcut_handling_suspended() { return shortcut_handling_suspended_; }
+  bool shortcut_handling_suspended() const;
 
   // Register a keyboard accelerator for the specified target. If multiple
   // targets are registered for an accelerator, a target registered later has
   // higher priority.
   // |accelerator| is the accelerator to register.
   // |priority| denotes the priority of the handler.
   // NOTE: In almost all cases, you should specify kNormalPriority for this
   // parameter. Setting it to kHighPriority prevents Chrome from sending the
   // shortcut to the webpage if the renderer has focus, which is not desirable
   // except for very isolated cases.
@@ skipping 93 matching lines @@
   // hierarchy.
   // Returns NULL if no focusable view were found.
   View* FindFocusableView(FocusTraversable* focus_traversable,
                           View* starting_view,
                           bool reverse);
 
   // Process arrow key traversal. Returns true if the event has been consumed
   // and should not be processed further.
   bool ProcessArrowKeyTraversal(const ui::KeyEvent& event);
 
-  // Keeps track of whether shortcut handling is currently suspended.
-  static bool shortcut_handling_suspended_;
-
   // Whether arrow key traversal is enabled.
   static bool arrow_key_traversal_enabled_;
 
   // The top-level Widget this FocusManager is associated with.
   Widget* widget_;
 
   // The object which handles an accelerator when |accelerator_manager_| doesn't
   // handle it.
   scoped_ptr<FocusManagerDelegate> delegate_;
 
   // The view that currently is focused.
   View* focused_view_;
 
   // The AcceleratorManager this FocusManager is associated with.
   scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
 
+  // Accelerator processing is skipped if this callback returns true.
+  ReturnBoolCallback* shortcut_handling_suspended_callback_;
+
   // The storage id used in the ViewStorage to store/restore the view that last
   // had focus.
   int stored_focused_view_storage_id_;
 
   // The reason why the focus most recently changed.
   FocusChangeReason focus_change_reason_;
 
   // The list of registered FocusChange listeners.
   ObserverList<FocusChangeListener, true> focus_change_listeners_;
 
   // See description above getter.
   bool is_changing_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_FOCUS_FOCUS_MANAGER_H_