Update vector icons in browser profiles code (bubble, etc.) to structs.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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/views/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/chrome_signin_helper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 40 matching lines @@
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/vector_icons/vector_icons.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
@@ skipping 363 matching lines @@
 
     set_notify_enter_exit_on_child(true);
 
     // Photo overlay that appears when hovering over the button.
     photo_overlay_ = new views::ImageView();
 
     const SkColor kBackgroundColor = SkColorSetARGB(65, 255, 255, 255);
     photo_overlay_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColor));
     photo_overlay_->SetImage(gfx::CreateVectorIcon(
-        gfx::VectorIconId::PHOTO_CAMERA, 48u, SkColorSetRGB(0x33, 0x33, 0x33)));
+        kPhotoCameraIcon, 48u, SkColorSetRGB(0x33, 0x33, 0x33)));
 
     photo_overlay_->SetSize(gfx::Size(icon_image_side(), icon_image_side()));
     photo_overlay_->SetY(badge_spacing());
     photo_overlay_->SetVisible(false);
     AddChildView(photo_overlay_);
   }
 
   void PaintChildren(const ui::PaintContext& context) override {
     {
       // Display any children (the "change photo" overlay) as a circle.
@@ skipping 23 matching lines @@
 
       gfx::Point center_point = bounds.CenterPoint() + badge_offset_vector;
 
       // Paint the circular background.
       cc::PaintFlags flags;
       flags.setAntiAlias(true);
       flags.setColor(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_BubbleBackground));
       canvas->DrawCircle(center_point, GetProfileBadgeSize() / 2, flags);
 
-      gfx::VectorIconId icon_id;
+      const gfx::VectorIcon* icon = nullptr;

[Peter Kasting, 2017/03/02 23:12:51]

Nit: I'd avoid initializing this to avoid implying some codepath below might not
do so (and, hopefully, trigger a compiler warning if a path actually failed to
do so).  (2 places)

[Evan Stade, 2017/03/03 00:36:38]

Done.

       int icon_size;
       SkColor icon_color;
       if (switches::IsMaterialDesignUserMenu()) {
-        icon_id = profile_->IsChild()
-            ? gfx::VectorIconId::ACCOUNT_CHILD_CIRCLE
-            : gfx::VectorIconId::SUPERVISOR_ACCOUNT_CIRCLE;
+        icon = profile_->IsChild() ? &kAccountChildCircleIcon
+                                   : &kSupervisorAccountCircleIcon;
         icon_size = 22;
         icon_color = gfx::kChromeIconGrey;
       } else {
         // Paint the light blue circle.
         flags.setColor(SkColorSetRGB(0xaf, 0xd9, 0xfc));
         canvas->DrawCircle(
             center_point, GetProfileBadgeSize() / 2 - kProfileBadgeWhitePadding,
             flags);
 
-        icon_id = profile_->IsChild()
-            ? gfx::VectorIconId::ACCOUNT_CHILD
-            : gfx::VectorIconId::SUPERVISOR_ACCOUNT;
+        icon =
+            profile_->IsChild() ? &kAccountChildIcon : &kSupervisorAccountIcon;
         icon_size = profile_->IsChild() ? 26 : 20;
         icon_color = SkColorSetRGB(0, 0x66, 0xff);
       }
 
       // Paint the badge icon.
       int offset = (GetProfileBadgeSize() - icon_size) / 2;
       canvas->Translate(badge_offset_vector + gfx::Vector2d(offset, offset));
-      gfx::PaintVectorIcon(canvas, icon_id, icon_size, icon_color);
+      gfx::PaintVectorIcon(canvas, *icon, icon_size, icon_color);
     }
   }
 
   static int icon_image_side() {
     return switches::IsMaterialDesignUserMenu() ? kMdImageSide
                                                 : kLargeImageSide;
   }
 
   static int badge_spacing() {
     // The space between the right/bottom edge of the profile badge and the
@@ skipping 75 matching lines @@
     button_ = new RightAlignedIconLabelButton(this, text);
     button_->SetFontListDeprecated(medium_font_list);
     // Show an "edit" pencil icon when hovering over. In the default state,
     // we need to create an empty placeholder of the correct size, so that
     // the text doesn't jump around when the hovered icon appears.
     // TODO(estade): revisit colors and press effect.
     const int kIconSize = 16;
     button_->SetImage(views::LabelButton::STATE_NORMAL,
                       CreateSquarePlaceholderImage(kIconSize));
     button_->SetImage(views::LabelButton::STATE_HOVERED,
-                      gfx::CreateVectorIcon(
-                          gfx::VectorIconId::MODE_EDIT, kIconSize,
-                          SkColorSetRGB(0x33, 0x33, 0x33)));
+                      gfx::CreateVectorIcon(kModeEditIcon, kIconSize,
+                                            SkColorSetRGB(0x33, 0x33, 0x33)));
     button_->SetImage(views::LabelButton::STATE_PRESSED,
-                      gfx::CreateVectorIcon(
-                          gfx::VectorIconId::MODE_EDIT, kIconSize,
-                          SkColorSetRGB(0x20, 0x20, 0x20)));
+                      gfx::CreateVectorIcon(kModeEditIcon, kIconSize,
+                                            SkColorSetRGB(0x20, 0x20, 0x20)));
     // We need to add a left padding as well as a small top/bottom padding
     // to the text to account for the textfield's border.
     const int kIconTextLabelButtonSpacing = 5;
     button_->SetBorder(views::CreateEmptyBorder(
         textfield_border_insets +
         gfx::Insets(0, kIconSize + kIconTextLabelButtonSpacing, 0, 0)));
     AddChildView(button_);
   }
 
   views::Textfield* profile_name_textfield() {
@@ skipping 949 matching lines @@
   views::View* view = new views::View();
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kMaterialMenuEdgeMargin,
       kMaterialMenuEdgeMargin, views::kUnrelatedControlHorizontalSpacing);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   view->SetLayoutManager(layout);
 
   // Adds the sync problem icon.
   views::ImageView* sync_problem_icon = new views::ImageView();
-  sync_problem_icon->SetImage(gfx::CreateVectorIcon(
-      gfx::VectorIconId::SYNC_PROBLEM, 20, gfx::kGoogleRed700));
+  sync_problem_icon->SetImage(
+      gfx::CreateVectorIcon(kSyncProblemIcon, 20, gfx::kGoogleRed700));
   view->AddChildView(sync_problem_icon);
 
   // Adds a vertical view to organize the error title, message, and button.
   views::View* vertical_view = new views::View();
   views::BoxLayout* vertical_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
                            views::kRelatedControlSmallVerticalSpacing);
   vertical_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   vertical_view->SetLayoutManager(vertical_layout);
@@ skipping 84 matching lines @@
       manage_accounts_link_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
       layout->AddView(manage_accounts_link_);
     } else {
       // Badge the email address if there's an authentication error.
       if (HasAuthError(browser_->profile())) {
         auth_error_email_button_ =
             new RightAlignedIconLabelButton(this, avatar_item.username);
         auth_error_email_button_->SetElideBehavior(gfx::ELIDE_EMAIL);
         auth_error_email_button_->SetImage(
             views::LabelButton::STATE_NORMAL,
-            gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 18,
-                                  gfx::kChromeIconGrey));
+            gfx::CreateVectorIcon(ui::kWarningIcon, 18, gfx::kChromeIconGrey));
         auth_error_email_button_->SetFocusForPlatform();
         gfx::Insets insets =
             views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
                 views::Button::STYLE_TEXTBUTTON);
         auth_error_email_button_->SetBorder(views::CreateEmptyBorder(
             insets.top(), insets.left(), insets.bottom(), insets.right()));
         layout->AddView(auth_error_email_button_);
       } else {
         // Add a small padding between the email button and the profile name.
         layout->StartRowWithPadding(1, 0, 0, 2);
@@ skipping 240 matching lines @@
       }
     }
 
     // Add the "Guest" button for browsing as guest
     if (!is_guest) {
       PrefService* service = g_browser_process->local_state();
       DCHECK(service);
       if (service->GetBoolean(prefs::kBrowserGuestModeEnabled)) {
         guest_profile_button_ = new BackgroundColorHoverButton(
             this, l10n_util::GetStringUTF16(IDS_GUEST_PROFILE_NAME),
-            gfx::CreateVectorIcon(gfx::VectorIconId::ACCOUNT_CIRCLE, kIconSize,
+            gfx::CreateVectorIcon(kAccountCircleIcon, kIconSize,
                                   gfx::kChromeIconGrey));
         layout->StartRow(1, 0);
         layout->AddView(guest_profile_button_);
       }
     }
   }
 
   base::string16 text;
-  gfx::VectorIconId settings_icon;
+  const gfx::VectorIcon* settings_icon = nullptr;
   if (switches::IsMaterialDesignUserMenu()) {
     text = is_guest
                ? l10n_util::GetStringUTF16(IDS_PROFILES_EXIT_GUEST)
                : l10n_util::GetStringUTF16(IDS_PROFILES_MANAGE_USERS_BUTTON);
-    settings_icon =
-        is_guest ? gfx::VectorIconId::CLOSE_ALL : gfx::VectorIconId::SETTINGS;
+    settings_icon = is_guest ? &kCloseAllIcon : &kSettingsIcon;
   } else {
     text = is_guest
                ? l10n_util::GetStringUTF16(IDS_PROFILES_EXIT_GUEST)
                : l10n_util::GetStringUTF16(IDS_PROFILES_SWITCH_USERS_BUTTON);
-    settings_icon = gfx::VectorIconId::ACCOUNT_BOX;
+    settings_icon = &kAccountBoxIcon;
   }
   users_button_ = new BackgroundColorHoverButton(
-      this, text, gfx::CreateVectorIcon(settings_icon, kIconSize,
-                                        gfx::kChromeIconGrey));
+      this, text,
+      gfx::CreateVectorIcon(*settings_icon, kIconSize, gfx::kChromeIconGrey));
 
   layout->StartRow(1, 0);
   layout->AddView(users_button_);
 
   if (!switches::IsMaterialDesignUserMenu() && ShouldShowGoIncognito()) {
     layout->StartRow(1, 0);
     layout->AddView(new views::Separator());
 
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     go_incognito_button_ = new BackgroundColorHoverButton(
         this,
         l10n_util::GetStringUTF16(IDS_PROFILES_GO_INCOGNITO_BUTTON),
         *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_INCOGNITO));
     layout->StartRow(1, 0);
     layout->AddView(go_incognito_button_);
   }
 
   if (display_lock) {
     if (!switches::IsMaterialDesignUserMenu()) {
       layout->StartRow(1, 0);
       layout->AddView(new views::Separator());
     }
 
     lock_button_ = new BackgroundColorHoverButton(
         this, l10n_util::GetStringUTF16(IDS_PROFILES_PROFILE_SIGNOUT_BUTTON),
-        gfx::CreateVectorIcon(gfx::VectorIconId::LOCK, kIconSize,
-                              gfx::kChromeIconGrey));
+        gfx::CreateVectorIcon(kLockIcon, kIconSize, gfx::kChromeIconGrey));
     layout->StartRow(1, 0);
     layout->AddView(lock_button_);
   } else if (switches::IsMaterialDesignUserMenu() && !is_guest) {
     int num_browsers = 0;
     for (auto* browser : *BrowserList::GetInstance()) {
       if (browser->profile()->GetOriginalProfile() ==
           browser_->profile()->GetOriginalProfile())
         num_browsers++;
     }
     if (num_browsers > 1) {
       close_all_windows_button_ = new BackgroundColorHoverButton(
           this,
           l10n_util::GetStringUTF16(IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON),
-          gfx::CreateVectorIcon(gfx::VectorIconId::CLOSE_ALL, kIconSize,
+          gfx::CreateVectorIcon(kCloseAllIcon, kIconSize,
                                 gfx::kChromeIconGrey));
       layout->StartRow(1, 0);
       layout->AddView(close_all_windows_button_);
     }
   }
 
   if (switches::IsMaterialDesignUserMenu())
     layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
   return view;
 }
@@ skipping 78 matching lines @@
   std::string email = signin_ui_util::GetDisplayEmail(browser_->profile(),
                                                       account_id);
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* delete_default_image =
       rb->GetImageNamed(IDR_CLOSE_1).ToImageSkia();
   const int kDeleteButtonWidth = delete_default_image->width();
   gfx::ImageSkia warning_default_image;
   int warning_button_width = 0;
   if (reauth_required) {
     const int kIconSize = 18;
-    warning_default_image = gfx::CreateVectorIcon(
-        gfx::VectorIconId::WARNING, kIconSize, gfx::kChromeIconGrey);
+    warning_default_image = gfx::CreateVectorIcon(ui::kWarningIcon, kIconSize,
+                                                  gfx::kChromeIconGrey);
     warning_button_width = kIconSize + views::kRelatedButtonHSpacing;
   }
   int available_width = width - 2 * views::kButtonHEdgeMarginNew -
                         kDeleteButtonWidth - warning_button_width;
   views::LabelButton* email_button = new BackgroundColorHoverButton(
       this, base::UTF8ToUTF16(email), warning_default_image);
   email_button->SetEnabled(reauth_required);
   email_button->SetElideBehavior(gfx::ELIDE_EMAIL);
   email_button->SetMinSize(gfx::Size(0, kButtonHeight));
   email_button->SetMaxSize(gfx::Size(available_width, kButtonHeight));
@@ skipping 220 matching lines @@
   content_label->SetFontList(small_font_list);
   layout->AddView(content_label);
 
   // Adds "Add person" button.
   layout->StartRowWithPadding(1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(new views::Separator());
 
   const int kIconSize = 24;
   add_person_button_ = new BackgroundColorHoverButton(
       this, l10n_util::GetStringUTF16(IDS_PROFILES_ADD_PERSON_BUTTON),
-      gfx::CreateVectorIcon(gfx::VectorIconId::ACCOUNT_BOX, kIconSize,
-                            gfx::kChromeIconGrey));
+      gfx::CreateVectorIcon(kAccountBoxIcon, kIconSize, gfx::kChromeIconGrey));
   layout->StartRow(1, 0);
   layout->AddView(add_person_button_);
 
   // Adds "Disconnect your Google Account" button.
   layout->StartRow(1, 0);
   layout->AddView(new views::Separator());
 
   disconnect_button_ = new BackgroundColorHoverButton(
       this, l10n_util::GetStringUTF16(IDS_PROFILES_DISCONNECT_BUTTON),
-      gfx::CreateVectorIcon(gfx::VectorIconId::REMOVE_BOX, kIconSize,
-                            gfx::kChromeIconGrey));
+      gfx::CreateVectorIcon(kRemoveBoxIcon, kIconSize, gfx::kChromeIconGrey));
   layout->StartRow(1, 0);
   layout->AddView(disconnect_button_);
 
   TitleCard* title_card = new TitleCard(
       l10n_util::GetStringFUTF16(IDS_PROFILES_NOT_YOU, avatar_item.name),
       this, &switch_user_cancel_button_);
   return TitleCard::AddPaddedTitleCard(view, title_card,
       kFixedSwitchUserViewWidth);
 }
 
 bool ProfileChooserView::ShouldShowGoIncognito() const {
   bool incognito_available =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }