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

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #import <Carbon/Carbon.h>  // kVK_Return.
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/mac/bundle_locations.h"
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.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"
@@ skipping 50 matching lines @@
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.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"
 
 namespace {
 
 // Constants taken from the Windows/Views implementation at:
 // chrome/browser/ui/views/profile_chooser_view.cc
 const int kLargeImageSide = 88;
 const int kSmallImageSide = 32;
 const int kMdImageSide = 40;
@@ skipping 1854 matching lines @@
                  skia::SkColorToCalibratedNSColor(gfx::kGoogleRed700));
   [titleLabel setFrameSize:NSMakeSize(availableWidth, 0)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:titleLabel];
   [container addSubview:titleLabel];
   yOffset = NSMaxY([titleLabel frame]);
 
   // Adds the sync problem icon.
   base::scoped_nsobject<NSImageView> syncProblemIcon([[NSImageView alloc]
       initWithFrame:NSMakeRect(kHorizontalSpacing, yOffset - iconSize, iconSize,
                                iconSize)]);
-  [syncProblemIcon setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
-                                gfx::VectorIconId::SYNC_PROBLEM, iconSize,
-                                gfx::kGoogleRed700))];
+  [syncProblemIcon
+      setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
+                   kSyncProblemIcon, iconSize, gfx::kGoogleRed700))];
   [container addSubview:syncProblemIcon];
 
   [container
       setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset + kVerticalSpacing)];
   return container.autorelease();
 }
 
 - (NSView*)createCurrentProfileView:(const AvatarMenu::Item&)item {
   base::scoped_nsobject<NSView> container([[NSView alloc]
       initWithFrame:NSZeroRect]);
@@ skipping 141 matching lines @@
                    badgeSize, badgeSize);
     base::scoped_nsobject<BackgroundCircleView> badgeIconWithCircle([
         [BackgroundCircleView alloc] initWithFrame:badgeIconCircleFrame
                                      withFillColor:GetDialogBackgroundColor()]);
     // Add the badge icon.
     constexpr int borderWidth = 1;
     const int badgeIconSize = badgeSize - borderWidth * 2;
     base::scoped_nsobject<NSImageView> badgeIconView([[NSImageView alloc]
         initWithFrame:NSMakeRect(borderWidth, borderWidth,
                                  badgeIconSize, badgeIconSize)]);
-    gfx::VectorIconId badgeIcon =
-        browser_->profile()->IsChild()
-            ? gfx::VectorIconId::ACCOUNT_CHILD_CIRCLE
-            : gfx::VectorIconId::SUPERVISOR_ACCOUNT_CIRCLE;
+    const gfx::VectorIcon& badgeIcon = browser_->profile()->IsChild()
+                                           ? kAccountChildCircleIcon
+                                           : kSupervisorAccountCircleIcon;
     [badgeIconView
         setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
                      badgeIcon, badgeIconSize, gfx::kChromeIconGrey))];
     [badgeIconWithCircle addSubview:badgeIconView];
 
     [profileCard addSubview:badgeIconWithCircle];
   }
 
   // Profile name, left-aligned to the right of profile icon.
   xOffset += kMdImageSide + kHorizontalSpacing;
@@ skipping 359 matching lines @@
 
   // Create a lock profile button when supervised users exist; otherwise, create
   // a button that closes all of the current profile's windows if more than one
   // is open.
   if (showLock) {
     NSButton* lockButton =
         [self hoverButtonWithRect:viewRect
                              text:l10n_util::GetNSString(
                                       IDS_PROFILES_PROFILE_SIGNOUT_BUTTON)
                             image:NSImageFromImageSkia(gfx::CreateVectorIcon(
-                                      gfx::VectorIconId::LOCK,
-                                      material_icon_size, gfx::kChromeIconGrey))
+                                      kLockIcon, material_icon_size,
+                                      gfx::kChromeIconGrey))
                            action:@selector(lockProfile:)];
     [container addSubview:lockButton];
     viewRect.origin.y = NSMaxY([lockButton frame]);
   } else if (!isGuestSession_) {
     int num_browsers = 0;
     for (auto* browser : *BrowserList::GetInstance()) {
       Profile* current_profile = browser_->profile()->GetOriginalProfile();
       if (browser->profile()->GetOriginalProfile() == current_profile)
         num_browsers++;
     }
     if (num_browsers > 1) {
-      NSButton* closeAllWindowsButton = [self
-          hoverButtonWithRect:viewRect
-                         text:l10n_util::GetNSString(
-                                  IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON)
-                        image:NSImageFromImageSkia(gfx::CreateVectorIcon(
-                                  gfx::VectorIconId::CLOSE_ALL,
-                                  material_icon_size, gfx::kChromeIconGrey))
-                       action:@selector(closeAllWindows:)];
+      NSButton* closeAllWindowsButton =
+          [self hoverButtonWithRect:viewRect
+                               text:l10n_util::GetNSString(
+                                        IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON)
+                              image:NSImageFromImageSkia(gfx::CreateVectorIcon(
+                                        kCloseAllIcon, material_icon_size,
+                                        gfx::kChromeIconGrey))
+                             action:@selector(closeAllWindows:)];
       [container addSubview:closeAllWindowsButton];
       viewRect.origin.y = NSMaxY([closeAllWindowsButton frame]);
     }
   }
 
   // Create a manage users/exit guest button.
   NSString* text =
       isGuestSession_
           ? l10n_util::GetNSString(IDS_PROFILES_EXIT_GUEST)
           : l10n_util::GetNSString(IDS_PROFILES_MANAGE_USERS_BUTTON);
   NSImage* icon = NSImageFromImageSkia(
-      gfx::CreateVectorIcon(isGuestSession_ ? gfx::VectorIconId::CLOSE_ALL
-                                            : gfx::VectorIconId::SETTINGS,
+      gfx::CreateVectorIcon(isGuestSession_ ? kCloseAllIcon : kSettingsIcon,
                             material_icon_size, gfx::kChromeIconGrey));
   SEL action =
       isGuestSession_ ? @selector(exitGuest:) : @selector(showUserManager:);
   NSButton* manageUsersButton =
       [self hoverButtonWithRect:viewRect text:text image:icon action:action];
   viewRect.origin.y = NSMaxY([manageUsersButton frame]);
   [container addSubview:manageUsersButton];
 
   // Create a guest profile button.
   if (!isGuestSession_) {
     PrefService* service = g_browser_process->local_state();
     DCHECK(service);
     if (service->GetBoolean(prefs::kBrowserGuestModeEnabled)) {
-      NSButton* guestProfileButton = [self
-          hoverButtonWithRect:viewRect
-                         text:l10n_util::GetNSString(
-                                  IDS_PROFILES_GUEST_PROFILE_NAME)
-                        image:NSImageFromImageSkia(gfx::CreateVectorIcon(
-                                  gfx::VectorIconId::ACCOUNT_CIRCLE,
-                                  material_icon_size, gfx::kChromeIconGrey))
-                       action:@selector(switchToGuest:)];
+      NSButton* guestProfileButton =
+          [self hoverButtonWithRect:viewRect
+                               text:l10n_util::GetNSString(
+                                        IDS_PROFILES_GUEST_PROFILE_NAME)
+                              image:NSImageFromImageSkia(gfx::CreateVectorIcon(
+                                        kAccountCircleIcon, material_icon_size,
+                                        gfx::kChromeIconGrey))
+                             action:@selector(switchToGuest:)];
       viewRect.origin.y = NSMaxY([guestProfileButton frame]);
       [container addSubview:guestProfileButton];
     }
   }
 
   [container setFrameSize:NSMakeSize(rect.size.width, viewRect.origin.y)];
   return container.autorelease();
 }
 
 - (NSView*)createAccountsListWithRect:(NSRect)rect {
@@ skipping 385 matching lines @@
 
 - (void)showWindow:(id)sender {
   [super showWindow:sender];
   NSEvent *event = [[NSApplication sharedApplication] currentEvent];
   if (firstProfileView_ && [event type] == NSKeyDown) {
     [[self window] makeFirstResponder:firstProfileView_];
   }
 }
 
 @end