Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2012 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/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h"
-#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
@@ skipping 31 matching lines @@
 #include "ash/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 #if defined(OS_MACOSX)
 // An empty command used because of a bug in AppKit menus.
-// See comment in CreateExtensionToolbarOverflowMenu().
+// See comment in CreateActionToolbarOverflowMenu().
 const int kEmptyMenuItemCommand = 0;
 #endif
 
 // Conditionally return the update app menu item title based on upgrade detector
 // state.
 base::string16 GetUpgradeDialogMenuItemName() {
   if (UpgradeDetector::GetInstance()->is_outdated_install() ||
       UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
     return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM);
   } else {
@@ skipping 676 matching lines @@
   if (error)
     return true;
 
   return chrome::IsCommandEnabled(browser_, command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
   switch (command_id) {
 #if defined(OS_MACOSX)
     case kEmptyMenuItemCommand:
-      return false;  // Always hidden (see CreateExtensionToolbarOverflowMenu).
+      return false;  // Always hidden (see CreateActionToolbarOverflowMenu).
 #endif
 #if defined(OS_WIN)
     case IDC_VIEW_INCOMPATIBILITIES: {
       EnumerateModulesModel* loaded_modules =
           EnumerateModulesModel::GetInstance();
       if (loaded_modules->confirmed_bad_modules_detected() <= 0)
         return false;
       // We'll leave the wrench adornment on until the user clicks the link.
       if (loaded_modules->modules_to_notify_about() <= 0)
         loaded_modules->AcknowledgeConflictNotification();
@@ skipping 76 matching lines @@
 // Menu is organised as follows:
 // - Extension toolbar overflow.
 // - Global browser errors and warnings.
 // - Tabs and windows.
 // - Places previously been e.g. History, bookmarks, recent tabs.
 // - Page actions e.g. zoom, edit, find, print.
 // - Learn about the browser and global customisation e.g. settings, help.
 // - Browser relaunch, quit.
 void WrenchMenuModel::Build() {
   if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
-    CreateExtensionToolbarOverflowMenu();
+    CreateActionToolbarOverflowMenu();
 
   AddItem(IDC_VIEW_INCOMPATIBILITIES,
       l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
           ui::ResourceBundle::GetSharedInstance().
               GetNativeImageNamed(IDR_INPUT_ALERT_MENU));
   if (IsCommandIdVisible(IDC_UPGRADE_DIALOG))
     AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
   if (AddGlobalErrorMenuItems() ||
       IsCommandIdVisible(IDC_VIEW_INCOMPATIBILITIES) ||
@@ skipping 126 matching lines @@
         const gfx::Image& image = rb.GetNativeImageNamed(icon_id);
         SetIcon(GetIndexOfCommandId(error->MenuItemCommandID()),
                 image);
       }
       menu_items_added = true;
     }
   }
   return menu_items_added;
 }
 
-void WrenchMenuModel::CreateExtensionToolbarOverflowMenu() {
+void WrenchMenuModel::CreateActionToolbarOverflowMenu() {
   // We only add the extensions overflow container if there are any icons that
   // aren't shown in the main container or if there are component actions.

[Peter Kasting, 2015/08/06 20:15:18]

Nit: I think this comment needs updating?

[apacible, 2015/08/10 22:38:11]

Done.

-  // TODO(apacible): Remove check for component actions when
-  // ExtensionToolbarModel can support them.
-  if (!extensions::ExtensionToolbarModel::Get(browser_->profile())->
-          all_icons_visible() ||
-      ComponentToolbarActionsFactory::GetInstance()->
-          GetNumComponentActions(browser_) > 0) {
+  if (!ToolbarActionsModel::Get(browser_->profile())->all_icons_visible()) {
 #if defined(OS_MACOSX)
     // There's a bug in AppKit menus, where if a menu item with a custom view
     // (like the extensions overflow menu) is the first menu item, it is not
     // highlightable or keyboard-selectable.
     // Adding any menu item before it (even one which is never visible) prevents
     // it, so add a bogus item here that will always be hidden.
     AddItem(kEmptyMenuItemCommand, base::string16());
 #endif
     AddItem(IDC_EXTENSIONS_OVERFLOW_MENU, base::string16());
     AddSeparator(ui::UPPER_SEPARATOR);
@@ skipping 44 matching lines @@
                        ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }