Switch global error menu icon to vectorized MD asset

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"
@@ skipping 348 matching lines @@
   return command_id != IDC_ZOOM_MINUS && command_id != IDC_ZOOM_PLUS;
 }
 
 bool WrenchMenuModel::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDC_ZOOM_PERCENT_DISPLAY ||
 #if defined(OS_MACOSX)
          command_id == IDC_FULLSCREEN ||
 #elif defined(OS_WIN)
          command_id == IDC_PIN_TO_START_SCREEN ||
 #endif
-         command_id == IDC_UPGRADE_DIALOG ||
-         (!switches::IsNewAvatarMenu() && command_id == IDC_SHOW_SIGNIN);
+         command_id == IDC_UPGRADE_DIALOG;
 }
 
 base::string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
   switch (command_id) {
     case IDC_ZOOM_PERCENT_DISPLAY:
       return zoom_label_;
 #if defined(OS_MACOSX)
     case IDC_FULLSCREEN: {
       int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
       // Note: On startup, |window()| may be NULL.
       if (browser_->window() && browser_->window()->IsFullscreen())
         string_id = IDS_EXIT_FULLSCREEN_MAC;
       return l10n_util::GetStringUTF16(string_id);
     }
 #elif defined(OS_WIN)
     case IDC_PIN_TO_START_SCREEN: {
       int string_id = IDS_PIN_TO_START_SCREEN;
       WebContents* web_contents =
           browser_->tab_strip_model()->GetActiveWebContents();
       MetroPinTabHelper* tab_helper =
           web_contents ? MetroPinTabHelper::FromWebContents(web_contents)
                        : NULL;
       if (tab_helper && tab_helper->IsPinned())
         string_id = IDS_UNPIN_FROM_START_SCREEN;
       return l10n_util::GetStringUTF16(string_id);
     }
 #endif
     case IDC_UPGRADE_DIALOG:
       return GetUpgradeDialogMenuItemName();
-    case IDC_SHOW_SIGNIN:
-      DCHECK(!switches::IsNewAvatarMenu());
-      return signin_ui_util::GetSigninMenuLabel(
-          browser_->profile()->GetOriginalProfile());
     default:
       NOTREACHED();
       return base::string16();
   }
 }
 
 bool WrenchMenuModel::GetIconForCommandId(int command_id,
                                           gfx::Image* icon) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   switch (command_id) {
     case IDC_UPGRADE_DIALOG: {
       if (UpgradeDetector::GetInstance()->notify_upgrade()) {
         *icon = rb.GetNativeImageNamed(
             UpgradeDetector::GetInstance()->GetIconResourceID());
         return true;
       }
       return false;
     }
-    case IDC_SHOW_SIGNIN: {
-      DCHECK(!switches::IsNewAvatarMenu());
-      GlobalError* error = signin_ui_util::GetSignedInServiceError(
-          browser_->profile()->GetOriginalProfile());
-      if (error) {
-        int icon_id = error->MenuItemIconResourceID();
-        if (icon_id) {
-          *icon = rb.GetNativeImageNamed(icon_id);
-          return true;
-        }
-      }
-      return false;
-    }
     default:
       break;
   }
   return false;
 }
 
 void WrenchMenuModel::ExecuteCommand(int command_id, int event_flags) {
   GlobalError* error = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetGlobalErrorByMenuItemCommandID(command_id);
   if (error) {
     error->ExecuteMenuItem(browser_);
     return;
   }
 
-  if (!switches::IsNewAvatarMenu() && command_id == IDC_SHOW_SIGNIN) {
-    // If a custom error message is being shown, handle it.
-    GlobalError* error = signin_ui_util::GetSignedInServiceError(
-        browser_->profile()->GetOriginalProfile());
-    if (error) {
-      error->ExecuteMenuItem(browser_);
-      return;
-    }
-  }
-
   LogMenuMetrics(command_id);
   chrome::ExecuteCommand(browser_, command_id);
 }
 
 void WrenchMenuModel::LogMenuMetrics(int command_id) {
   base::TimeDelta delta = timer_.Elapsed();
 
   switch (command_id) {
     case IDC_NEW_TAB:
       if (!uma_action_recorded_)
@@ skipping 454 matching lines @@
           switches::kEnableDomDistiller))
     AddItemWithStringId(IDC_DISTILL_PAGE, IDS_DISTILL_PAGE);
   tools_menu_model_.reset(new ToolsMenuModel(this, browser_));
   AddSubMenuWithStringId(
       IDC_MORE_TOOLS_MENU, IDS_MORE_TOOLS_MENU, tools_menu_model_.get());
   // Append the full menu including separators. The final separator only gets
   // appended when this is a touch menu - otherwise it would get added twice.
   CreateCutCopyPasteMenu();
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
-#if !defined(OS_CHROMEOS)
-  if (!switches::IsNewAvatarMenu()) {
-    // No "Sign in to Chromium..." menu item on ChromeOS.
-    SigninManager* signin = SigninManagerFactory::GetForProfile(
-        browser_->profile()->GetOriginalProfile());
-    if (signin && signin->IsSigninAllowed() &&
-        signin_ui_util::GetSignedInServiceErrors(
-            browser_->profile()->GetOriginalProfile()).empty()) {
-      AddItem(IDC_SHOW_SYNC_SETUP,
-              l10n_util::GetStringFUTF16(
-                  IDS_SYNC_MENU_PRE_SYNCED_LABEL,
-                  l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
-    }
-  }
-#endif
 // The help submenu is only displayed on official Chrome builds. As the
 // 'About' item has been moved to this submenu, it's reinstated here for
 // Chromium builds.
 #if defined(GOOGLE_CHROME_BUILD)
   help_menu_model_.reset(new HelpMenuModel(this, browser_));
   AddSubMenuWithStringId(IDC_HELP_MENU, IDS_HELP_MENU,
                          help_menu_model_.get());
 #else
   AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
 #endif
@@ skipping 24 matching lines @@
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
   uma_action_recorded_ = false;
 }
 
 bool WrenchMenuModel::AddGlobalErrorMenuItems() {
   // TODO(sail): Currently we only build the wrench menu once per browser
   // window. This means that if a new error is added after the menu is built
   // it won't show in the existing wrench menu. To fix this we need to some
   // how update the menu if new errors are added.
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // GetSignedInServiceErrors() can modify the global error list, so call it
   // before iterating through that list below.
   std::vector<GlobalError*> signin_errors;
   signin_errors = signin_ui_util::GetSignedInServiceErrors(
       browser_->profile()->GetOriginalProfile());

[Roger Tawa OOO till Jul 10th, 2015/08/27 20:24:15]

I think you can delete lines 949-953.

[Evan Stade, 2015/08/27 20:51:13]

you're right, I might be able to, but I'm worried it will break mac again, so
I'll have to double check that.

   const GlobalErrorService::GlobalErrorList& errors =
       GlobalErrorServiceFactory::GetForProfile(browser_->profile())->errors();
   bool menu_items_added = false;
   for (GlobalErrorService::GlobalErrorList::const_iterator
        it = errors.begin(); it != errors.end(); ++it) {
     GlobalError* error = *it;
     DCHECK(error);
     if (error->HasMenuItem()) {
-#if !defined(OS_CHROMEOS)
-      // Don't add a signin error if it's already being displayed elsewhere.
-      if (std::find(signin_errors.begin(), signin_errors.end(), error) !=
-          signin_errors.end()) {
-        MenuModel* model = this;
-        int index = 0;
-        if (MenuModel::GetModelAndIndexForCommandId(
-                IDC_SHOW_SIGNIN, &model, &index)) {
-          continue;
-        }
-      }
-#endif
-
       AddItem(error->MenuItemCommandID(), error->MenuItemLabel());
-      int icon_id = error->MenuItemIconResourceID();
-      if (icon_id) {
-        const gfx::Image& image = rb.GetNativeImageNamed(icon_id);
-        SetIcon(GetIndexOfCommandId(error->MenuItemCommandID()),
-                image);
-      }
+      SetIcon(GetIndexOfCommandId(error->MenuItemCommandID()),
+              error->MenuItemIcon());
       menu_items_added = true;
     }
   }
   return menu_items_added;
 }
 
 void WrenchMenuModel::CreateActionToolbarOverflowMenu() {
   // We only add the extensions overflow container if there are any icons that
   // aren't shown in the main container.
   if (!ToolbarActionsModel::Get(browser_->profile())->all_icons_visible()) {
@@ skipping 54 matching lines @@
                        ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }