Remove the implicit wrench menu items for browser actions.

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
@@ skipping 119 matching lines @@
       is_attempting_to_close_browser_(false),
       cancel_download_confirmation_state_(NOT_PROMPTED),
       maximized_state_(MAXIMIZED_STATE_DEFAULT),
       method_factory_(this) {
   tabstrip_model_.AddObserver(this);
 
   registrar_.Add(this, NotificationType::SSL_VISIBLE_STATE_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
-                 NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_PROCESS_CRASHED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::HISTORY_TOO_NEW,
                  NotificationService::AllSources());
 
   // Need to know when to alert the user of theme install delay.
@@ skipping 1310 matching lines @@
     default:
       LOG(WARNING) << "Received Unimplemented Command: " << id;
       break;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, CommandUpdater::CommandUpdaterDelegate implementation:
 
 void Browser::ExecuteCommand(int id) {
-  if (id >= IDC_BROWSER_ACTION_FIRST && id <= IDC_BROWSER_ACTION_LAST) {
-    ExtensionsService* service = profile_->GetExtensionsService();
-    DCHECK(service);  // No browser action command should have been created
-                      // in this window.
-
-    // Go find the browser action in question.
-    std::vector<ExtensionAction*> browser_actions =
-        service->GetBrowserActions(false);  // false means no popup actions.
-    for (size_t i = 0; i < browser_actions.size(); ++i) {
-      if (browser_actions[i]->command_id() == id) {
-        ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
-            profile_, browser_actions[i]->extension_id(), this);
-        return;
-      }
-    }
-
-    // Could not find the command in question. Perhaps it went away while the
-    // menu was open? More likely, it is a bug.
-    LOG(WARNING) << "Unknown browser action executed: " << id;
-  }
-
   ExecuteCommandWithDisposition(id, CURRENT_TAB);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelDelegate implementation:
 
 TabContents* Browser::AddBlankTab(bool foreground) {
   return AddBlankTabAt(-1, foreground);
 }
 
@@ skipping 680 matching lines @@
       break;
 
     case NotificationType::EXTENSION_UPDATE_DISABLED: {
       // Show the UI.
       ExtensionsService* service = Source<ExtensionsService>(source).ptr();
       Extension* extension = Details<Extension>(details).ptr();
       ShowExtensionDisabledUI(service, profile_, extension);
       break;
     }
 
-    case NotificationType::EXTENSION_LOADED: {
-      // Enable the browser action for the extension, if it has one.
-      Extension* extension = Details<Extension>(details).ptr();
-      if (extension->browser_action()) {
-        command_updater_.UpdateCommandEnabled(
-            extension->browser_action()->command_id(), true);
-      }
-      break;
-    }
-
     case NotificationType::EXTENSION_UNLOADED: {
       window()->GetLocationBar()->InvalidatePageActions();
 
       // Close any tabs from the unloaded extension.
       Extension* extension = Details<Extension>(details).ptr();
       for (int i = 0; i < tabstrip_model_.count(); i++) {
         TabContents* tc = tabstrip_model_.GetTabContentsAt(i);
         if (tc->GetURL().SchemeIs(chrome::kExtensionScheme) &&
             tc->GetURL().host() == extension->id()) {
           CloseTabContents(tc);
           return;
         }
       }
 
-      // Disable the browser action for the extension, if it has one.
-      if (extension->browser_action()) {
-        command_updater_.UpdateCommandEnabled(
-            extension->browser_action()->command_id(), false);
-      }
-
       break;
     }
 
     case NotificationType::EXTENSION_PROCESS_CRASHED: {
       window()->GetLocationBar()->InvalidatePageActions();
 
       TabContents* tab_contents = GetSelectedTabContents();
       if (!tab_contents)
         break;
       ExtensionsService* extensions_service =
@@ skipping 137 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
   command_updater_.UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true);
 #if defined(OS_CHROMEOS)
   command_updater_.UpdateCommandEnabled(IDC_CONTROL_PANEL, true);
 #endif
 
-  // Set up any browser action commands that are installed.
-  ExtensionsService* service = profile()->GetExtensionsService();
-  if (service) {
-    std::vector<ExtensionAction*> browser_actions =
-        service->GetBrowserActions(false);  // false means no popup actions.
-    for (size_t i = 0; i < browser_actions.size(); ++i) {
-      command_updater_.UpdateCommandEnabled(browser_actions[i]->command_id(),
-                                            true);
-    }
-  }
-
   // Initialize other commands based on the window type.
   {
     bool normal_window = type() == TYPE_NORMAL;
 
     // Navigation commands
     command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
 
     // Window management commands
     command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
@@ skipping 573 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }