Allow WebContents key handling to supplant extension overrides of the bookmark shortcut

chrome/browser/ui/views/location_bar/page_action_image_view.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 "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ skipping 28 matching lines @@
   extensions::Command page_action_command;
   if (command_service->GetPageActionCommand(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &page_action_command,
           NULL)) {
     page_action_keybinding_.reset(
         new ui::Accelerator(page_action_command.accelerator()));
     owner_->GetFocusManager()->RegisterAccelerator(
         *page_action_keybinding_.get(),
-        ui::AcceleratorManager::kHighPriority,
+        GetAcceleratorPriority(page_action_command.accelerator(), extension),
         this);
   }
 }
 
 PageActionImageView::~PageActionImageView() {
   if (owner_->GetFocusManager()) {
     if (page_action_keybinding_.get()) {
       owner_->GetFocusManager()->UnregisterAccelerator(
           *page_action_keybinding_.get(), this);
     }
@@ skipping 91 matching lines @@
           views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
       views::MenuRunner::MENU_DELETED) {
     return;
   }
 }
 
 bool PageActionImageView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   DCHECK(visible());  // Should not have happened due to CanHandleAccelerator.
 
+  // Normal priority shortcuts must be handled via the standard browser command
+  // processing to be effective.
+  if (GetAcceleratorPriorityById(accelerator,

[Peter Kasting, 2014/07/07 23:47:10]

Nit: Shorter:

  const ui::AcceleratorManager::HandlerPriority priority =
      GetAcceleratorPriorityById(accelerator, extension_id, browser_context());
  if (priority == ui::AcceleratorManager::kHighPriority)
    ExecuteAction(ExtensionPopup::SHOW);
  return priority == ui::AcceleratorManager::kHighPriority;

[Mike Wittman, 2014/07/08 19:29:01]

Done, although requires an extra line for extension_id.

+                                 page_action()->extension_id(),
+                                 owner_->profile()) ==
+      ui::AcceleratorManager::kNormalPriority)
+    return false;
+
   ExecuteAction(ExtensionPopup::SHOW);
   return true;
 }
 
 bool PageActionImageView::CanHandleAccelerators() const {
   // While visible, we don't handle accelerators and while so we also don't
   // count as a priority accelerator handler.
   return visible();
 }
 
@@ skipping 63 matching lines @@
 
   popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow,
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }