Experimental Extension Keybinding (first cut).

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 "base/auto_reset.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/base/keycodes/keyboard_codes.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"
 
 namespace views {
 
@@ skipping 43 matching lines @@
     ui::Accelerator accelerator(ui::VKEY_MENU, false, false, false);
     return ProcessAccelerator(accelerator);
   } else {
     return false;
   }
 #else
   if (event.type() != ui::ET_KEY_PRESSED)
     return false;
 #endif
 
+  ui::Accelerator accelerator(event.key_code(),
+                              event.IsShiftDown(),
+                              event.IsControlDown(),
+                              event.IsAltDown());
+
 #if defined(OS_WIN)
   // If the focused view wants to process the key event as is, let it be.
   // On Linux we always dispatch key events to the focused view first, so
   // we should not do this check here. See also NativeWidgetGtk::OnKeyEvent().
-  if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event))
+  if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
+      !accelerator_manager_->HasPriorityHandler(accelerator))
     return true;
 #endif
 
   // Intercept Tab related messages for focus traversal.
   // Note that we don't do focus traversal if the root window is not part of the
   // active window hierarchy as this would mean we have no focused view and
   // would focus the first focusable view.
 #if defined(OS_WIN) && !defined(USE_AURA)
   HWND top_window = widget_->GetNativeView();
   HWND active_window = ::GetActiveWindow();
@@ skipping 26 matching lines @@
     } else if (index >= static_cast<int>(views.size())) {
       index = 0;
     }
     SetFocusedViewWithReason(views[index], kReasonFocusTraversal);
     return false;
   }
 
   // Process keyboard accelerators.
   // If the key combination matches an accelerator, the accelerator is
   // triggered, otherwise the key event is processed as usual.
-  ui::Accelerator accelerator(event.key_code(),
-                              event.IsShiftDown(),
-                              event.IsControlDown(),
-                              event.IsAltDown());
   if (ProcessAccelerator(accelerator)) {
     // If a shortcut was activated for this keydown message, do not propagate
     // the event further.
     return false;
   }
   return true;
 }
 
 void FocusManager::ValidateFocusedView() {
   if (focused_view_) {
@@ skipping 153 matching lines @@
   // Forget menu key state when the window lost focus.
   should_handle_menu_key_release_ = false;
 #endif
   ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
     // This should never happen but bug 981648 seems to indicate it could.
     NOTREACHED();
     return;
   }
 
-  // TODO (jcampan): when a TabContents containing a popup is closed, the focus
+  // TODO(jcivelli): when a TabContents containing a popup is closed, the focus
   // is stored twice causing an assert. We should find a better alternative than
   // removing the view from the storage explicitly.
   view_storage->RemoveView(stored_focused_view_storage_id_);
 
   if (!focused_view_)
     return;
 
   view_storage->StoreView(stored_focused_view_storage_id_, focused_view_);
 
   View* v = focused_view_;
@@ skipping 82 matching lines @@
         FocusSearch::DOWN,
         false,
         &new_focus_traversable,
         &new_starting_view);
   }
   return v;
 }
 
 void FocusManager::RegisterAccelerator(
     const ui::Accelerator& accelerator,
+    ui::AcceleratorManager::HandlerPriority priority,
     ui::AcceleratorTarget* target) {
-  accelerator_manager_->Register(accelerator, target);
+  accelerator_manager_->Register(accelerator, priority, target);
 }
 
 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);
 }
@@ skipping 17 matching lines @@
 void FocusManager::ResetMenuKeyState() {
   should_handle_menu_key_release_ = false;
 }
 #endif
 
 ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->GetCurrentTarget(accelerator);
 }
 
+bool FocusManager::HasPriorityHandler(
+    const ui::Accelerator& accelerator) const {
+  return accelerator_manager_->HasPriorityHandler(accelerator);
+}
+
 // static
 bool FocusManager::IsTabTraversalKeyEvent(const KeyEvent& key_event) {
   return key_event.key_code() == ui::VKEY_TAB && !key_event.IsControlDown();
 }
 
 void FocusManager::ViewRemoved(View* removed) {
   // If the view being removed contains (or is) the focused view,
   // clear the focus.  However, it's not safe to call ClearFocus()
   // (and in turn ClearNativeFocus()) here because ViewRemoved() can
   // be called while the top level widget is being destroyed.
   if (focused_view_ && removed && removed->Contains(focused_view_))
     SetFocusedView(NULL);
 }
 
 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.AddObserver(listener);
 }
 
 void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.RemoveObserver(listener);
 }
 
 }  // namespace views