Landing Hamaji accelerator clean-up patch

chrome/views/focus/focus_manager.h

 // Copyright (c) 2006-2008 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 CHROME_VIEWS_FOCUS_FOCUS_MANAGER_H_
 #define CHROME_VIEWS_FOCUS_FOCUS_MANAGER_H_
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
@@ skipping 239 matching lines @@
                                          AcceleratorTarget* target);
 
   // Unregister the specified keyboard accelerator for the specified target.
   void UnregisterAccelerator(const Accelerator& accelerator,
                              AcceleratorTarget* target);
 
   // Unregister all keyboard accelerator for the specified target.
   void UnregisterAccelerators(AcceleratorTarget* target);
 
   // Activate the target associated with the specified accelerator if any.
-  // If |prioritary_accelerators_only| is true, only the following accelerators
-  // are allowed:
-  // - a key combination including Ctrl or Alt
-  // - the escape key
-  // - the enter key
-  // - any F key (F1, F2, F3 ...)
-  // - any browser specific keys (as available on special keyboards)
   // Returns true if an accelerator was activated.
-  bool ProcessAccelerator(const Accelerator& accelerator,
-                          bool prioritary_accelerators_only);
+  bool ProcessAccelerator(const Accelerator& accelerator);
 
   // NotificationObserver method.
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details);
 
   void AddKeystrokeListener(KeystrokeListener* listener);
   void RemoveKeystrokeListener(KeystrokeListener* listener);
 
   // Adds/removes a listener.  The FocusChangeListener is notified every time
@@ skipping 59 matching lines @@
   // The list of registered FocusChange listeners.
   typedef std::vector<FocusChangeListener*> FocusChangeListenerList;
   FocusChangeListenerList focus_change_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_FOCUS_MANAGER_H_