Remove the implicit wrench menu items for browser actions.

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 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 "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 115 matching lines @@
     : MenuButton(this, L"", NULL, false),
       browser_action_(browser_action),
       browser_action_state_(extension->browser_action_state()),
       tracker_(NULL),
       panel_(panel) {
   set_alignment(TextButton::ALIGN_CENTER);
 
   // Load the images this view needs asynchronously on the file thread. We'll
   // get a call back into OnImageLoaded if the image loads successfully. If not,
   // the ImageView will have no image and will not appear in the browser chrome.
-  DCHECK(!browser_action->icon_paths().empty());
-  const std::vector<std::string>& icon_paths = browser_action->icon_paths();
-  browser_action_icons_.resize(icon_paths.size());
-  tracker_ = new ImageLoadingTracker(this, icon_paths.size());
-  for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
-       iter != icon_paths.end(); ++iter) {
-    tracker_->PostLoadImageTask(extension->GetResource(*iter));
+  if (!browser_action->icon_paths().empty()) {
+    const std::vector<std::string>& icon_paths = browser_action->icon_paths();
+    browser_action_icons_.resize(icon_paths.size());
+    tracker_ = new ImageLoadingTracker(this, icon_paths.size());
+    for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
+         iter != icon_paths.end(); ++iter) {
+      tracker_->PostLoadImageTask(extension->GetResource(*iter));
+    }
   }
 
   registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
                  Source<ExtensionAction>(browser_action_));
 }
 
 BrowserActionButton::~BrowserActionButton() {
   if (tracker_) {
     tracker_->StopTrackingImageLoad();
     tracker_ = NULL;  // The tracker object will be deleted when we return.
@@ skipping 14 matching lines @@
   DCHECK(index < browser_action_icons_.size());
   browser_action_icons_[index] = image ? *image : SkBitmap();
   if (index == browser_action_icons_.size() - 1) {
     OnStateUpdated();
     tracker_ = NULL;  // The tracker object will delete itself when we return.
   }
 }
 
 void BrowserActionButton::OnStateUpdated() {
   SkBitmap* image = browser_action_state_->icon();
-  if (!image)
-    image = &browser_action_icons_[browser_action_state_->icon_index()];
-  SetIcon(*image);
+  if (!image) {
+    if (static_cast<size_t>(browser_action_state_->icon_index()) <
+        browser_action_icons_.size()) {
+      image = &browser_action_icons_[browser_action_state_->icon_index()];
+    }
+  }
+
+  if (image)
+    SetIcon(*image);
+
   SetTooltipText(ASCIIToWide(browser_action_state_->title()));
   panel_->OnBrowserActionVisibilityChanged();
   GetParent()->SchedulePaint();
 }
 
 void BrowserActionButton::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED) {
     OnStateUpdated();
@@ skipping 217 matching lines @@
   // Get all browser actions, including those with popups.
   std::vector<ExtensionAction*> browser_actions;
   browser_actions = extension_service->GetBrowserActions(true);
 
   DeleteBrowserActionViews();
   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) {
-      BrowserActionView* view =
-          new BrowserActionView(browser_actions[i], extension, this);
-      browser_action_views_.push_back(view);
-      AddChildView(view);
-    }
+    BrowserActionView* view =
+        new BrowserActionView(browser_actions[i], extension, this);
+    browser_action_views_.push_back(view);
+    AddChildView(view);
   }
 }
 
 void BrowserActionsContainer::DeleteBrowserActionViews() {
   if (!browser_action_views_.empty()) {
     for (size_t i = 0; i < browser_action_views_.size(); ++i)
       RemoveChildView(browser_action_views_[i]);
     STLDeleteContainerPointers(browser_action_views_.begin(),
                                browser_action_views_.end());
     browser_action_views_.clear();
@@ skipping 117 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kIconSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kIconSize +
                   kHorizontalPadding * 2);
 }