Implement Keybinding for script badges.

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/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
@@ skipping 66 matching lines @@
 
   extensions::CommandService* command_service =
       extensions::CommandServiceFactory::GetForProfile(
           browser_->profile());
   extensions::Command page_action_command;
   if (command_service->GetPageActionCommand(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &page_action_command,
           NULL)) {
-    keybinding_.reset(new ui::Accelerator(page_action_command.accelerator()));
+    page_action_keybinding_.reset(
+        new ui::Accelerator(page_action_command.accelerator()));
     owner_->GetFocusManager()->RegisterAccelerator(
-        *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
+        *page_action_keybinding_.get(),
+        ui::AcceleratorManager::kHighPriority,
+        this);
+  }
+
+  extensions::Command script_badge_command;
+  if (command_service->GetScriptBadgeCommand(
+          extension->id(),
+          extensions::CommandService::ACTIVE_ONLY,
+          &script_badge_command,
+          NULL)) {
+    script_badge_keybinding_.reset(
+        new ui::Accelerator(script_badge_command.accelerator()));
+    owner_->GetFocusManager()->RegisterAccelerator(
+        *script_badge_keybinding_.get(),
+        ui::AcceleratorManager::kHighPriority,
+        this);
   }
 }
 
 PageActionImageView::~PageActionImageView() {
-  if (keybinding_.get() && owner_->GetFocusManager())
-    owner_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
+  if (owner_->GetFocusManager()) {
+    if (page_action_keybinding_.get()) {
+      owner_->GetFocusManager()->UnregisterAccelerator(
+          *page_action_keybinding_.get(), this);
+    }
+
+    if (script_badge_keybinding_.get()) {
+      owner_->GetFocusManager()->UnregisterAccelerator(
+          *script_badge_keybinding_.get(), this);
+    }
+  }
 
   if (popup_)
     popup_->GetWidget()->RemoveObserver(this);
   HidePopup();
 }
 
 void PageActionImageView::ExecuteAction(int button) {
   TabContents* tab_contents = owner_->GetTabContents();
   if (!tab_contents)
     return;
@@ skipping 210 matching lines @@
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
 
   popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow_location);
   popup_->GetWidget()->AddObserver(this);
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }