Integrate browser actions with the wrench menu. Browser actions

chrome/browser/views/browser_actions_container.cc

Index: chrome/browser/views/browser_actions_container.cc
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 52e35310f290e525cf982c6ba1232d626fdb712f..3181627a9fc3e8c6f89e51f220c26dc05639d3ca 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -140,14 +140,14 @@ void BrowserActionsContainer::RefreshBrowserActionViews() {
   std::vector<ContextualAction*> browser_actions;
   browser_actions = extension_service->GetBrowserActions();
 
-  if (browser_action_views_.size() != browser_actions.size()) {
-    DeleteBrowserActionViews();
-
-    for (size_t i = 0; i < browser_actions.size(); ++i) {
-      Extension* extension = extension_service->GetExtensionById(
-          browser_actions[i]->extension_id());
-      DCHECK(extension);
+  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) {
       BrowserActionImageView* view =
           new BrowserActionImageView(browser_actions[i], extension, this);
       browser_action_views_.push_back(view);