Remove the implicit wrench menu items for browser actions.

chrome/browser/views/toolbar_view.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/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 1063 matching lines @@
   if (g_browser_process->have_inspector_files()) {
     devtools_menu_contents_->AddItem(IDC_DEV_TOOLS,
                                      l10n_util::GetString(IDS_DEV_TOOLS));
   }
   devtools_menu_contents_->AddItem(IDC_TASK_MANAGER,
                                    l10n_util::GetString(IDS_TASK_MANAGER));
 }
 #endif
 
 void ToolbarView::CreateAppMenu() {
-  // We always rebuild the app menu so that we can get the current state of the
-  // extension system.
+  if (app_menu_contents_.get())
+    return;
 
   app_menu_contents_.reset(new views::SimpleMenuModel(this));
   app_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   app_menu_contents_->AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
   app_menu_contents_->AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW,
                                           IDS_NEW_INCOGNITO_WINDOW);
   // Enumerate profiles asynchronously and then create the parent menu item.
   // We will create the child menu items for this once the asynchronous call is
   // done.  See OnGetProfilesDone().
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableUserDataDirProfiles) &&
       !profiles_menu_contents_.get()) {
     profiles_helper_->GetProfiles(NULL);
     profiles_menu_contents_.reset(new views::SimpleMenuModel(this));
     app_menu_contents_->AddSubMenuWithStringId(IDS_PROFILE_MENU,
                                                profiles_menu_contents_.get());
   }
 
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR,
                                                IDS_SHOW_BOOKMARK_BAR);
   app_menu_contents_->AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
   app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER,
                                           IDS_BOOKMARK_MANAGER);
   app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS,
                                           IDS_SHOW_DOWNLOADS);
 
-  // Create the extensions item or submenu.
-  // If there are any browser actions, we create an "Extensions" submenu, of
-  // which "Manage extensions" is the first entry. If there are no browser
-  // actions, we just create an "Extensions" menu item which does the same thing
-  // as "Manage extensions".
+  // Create the manage extensions menu item.
   ExtensionsService* extensions_service =
       browser_->profile()->GetExtensionsService();
   if (extensions_service && extensions_service->extensions_enabled()) {
-    // Get a count of all non-popup browser actions to decide how to layout
-    // the Extensions menu.
-    std::vector<ExtensionAction*> browser_actions =
-        browser_->profile()->GetExtensionsService()->GetBrowserActions(false);
-    if (browser_actions.size() == 0) {
-      app_menu_contents_->AddItemWithStringId(IDC_MANAGE_EXTENSIONS,
-                                              IDS_SHOW_EXTENSIONS);
-    } else {
-      extension_menu_contents_.reset(new views::SimpleMenuModel(this));
-      app_menu_contents_->AddSubMenuWithStringId(
-          IDS_SHOW_EXTENSIONS, extension_menu_contents_.get());
-
-      extension_menu_contents_->AddItemWithStringId(IDC_MANAGE_EXTENSIONS,
-                                                    IDS_MANAGE_EXTENSIONS);
-
-      // TODO(erikkay) Even though we just got the list of all browser actions,
-      // we have to enumerate the list of extensions in order to get the action
-      // state.  It seems like we should find a way to combine these.
-      const ExtensionList* extensions = extensions_service->extensions();
-      for (size_t i = 0; i < extensions->size(); ++i) {
-        Extension* extension = extensions->at(i);
-        if (!extension->browser_action()) {
-          continue;
-        } else if (extension->browser_action()->command_id() >
-                   IDC_BROWSER_ACTION_LAST) {
-          NOTREACHED() << "Too many browser actions.";
-        } else if (!extension->browser_action()->is_popup()) {
-          extension_menu_contents_->AddItem(
-              extension->browser_action()->command_id(),
-              UTF8ToUTF16(extension->browser_action_state()->title()));
-        }
-      }
-    }
+    app_menu_contents_->AddItemWithStringId(IDC_MANAGE_EXTENSIONS,
+                                            IDS_SHOW_EXTENSIONS);
   }
 
   app_menu_contents_->AddSeparator();
 #ifdef CHROME_PERSONALIZATION
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
     app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS,
         l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL) + L"...");
     app_menu_contents_->AddSeparator();
   }
 #endif
   app_menu_contents_->AddItem(IDC_OPTIONS,
                               l10n_util::GetStringFUTF16(
                                   IDS_OPTIONS,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }