Integrate browser actions with the wrench menu. Browser actions

chrome/browser/views/browser_actions_container.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/views/browser_actions_container.h"
 
 #include "base/stl_util-inl.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
@@ skipping 122 matching lines @@
 }
 
 void BrowserActionsContainer::RefreshBrowserActionViews() {
   ExtensionsService* extension_service = profile_->GetExtensionsService();
   if (!extension_service)  // The |extension_service| can be NULL in Incognito.
     return;
 
   std::vector<ContextualAction*> browser_actions;
   browser_actions = extension_service->GetBrowserActions();
 
-  if (browser_action_views_.size() != browser_actions.size()) {
-    DeleteBrowserActionViews();
+  DeleteBrowserActionViews();
+  for (size_t i = 0; i < browser_actions.size(); ++i) {
+    Extension* extension = extension_service->GetExtensionById(
+        browser_actions[i]->extension_id());
+    DCHECK(extension);
 
-    for (size_t i = 0; i < browser_actions.size(); ++i) {
-      Extension* extension = extension_service->GetExtensionById(
-          browser_actions[i]->extension_id());
-      DCHECK(extension);
-
+    // Only show browser actions that have an icon.
+    if (browser_actions[i]->icon_paths().size() > 0) {
       BrowserActionImageView* view =
           new BrowserActionImageView(browser_actions[i], extension, this);
       browser_action_views_.push_back(view);
       AddChildView(view);
     }
   }
 }
 
 void BrowserActionsContainer::DeleteBrowserActionViews() {
   if (!browser_action_views_.empty()) {
@@ skipping 37 matching lines @@
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   if (type == NotificationType::EXTENSION_LOADED ||
       type == NotificationType::EXTENSION_UNLOADED ||
       type == NotificationType::EXTENSION_UNLOADED_DISABLED) {
     RefreshBrowserActionViews();
   } else {
     NOTREACHED() << L"Received unexpected notification";
   }
 }