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>
 
@@ skipping 208 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) {
+  void set_shortcut_handling_suspended(bool suspended) {
     shortcut_handling_suspended_ = suspended;
   }
   // Returns whether shortcut handling is currently suspended.
   bool shortcut_handling_suspended() { return shortcut_handling_suspended_; }
 
   // 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.
@@ skipping 97 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_;
 
+  // Keeps track of whether shortcut handling is currently suspended.
+  bool shortcut_handling_suspended_;
+
   // 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_