chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm - Issue 2729623002: Update vector icons in browser profiles code (bubble, etc.) to structs.

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 2729623002: Update vector icons in browser profiles code (bubble, etc.) to structs. (Closed)

Patch Set: review Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm ('k') | chrome/browser/ui/views/profiles/new_avatar_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

index 62b634fecd91984bf3e082ea20ad01bf59b94d7a..cdf9cf2b045d9b31b8877ce0d5cbea52b7b3cee5 100644

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

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

@@ -15,6 +15,7 @@

#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"

@@ -85,7 +86,6 @@

#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"

@@ -1960,9 +1960,9 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

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

@@ -2124,10 +2124,9 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

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))];

@@ -2507,8 +2506,8 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

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]);

@@ -2520,14 +2519,14 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

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]);

}

@@ -2539,8 +2538,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

? 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:);

@@ -2554,14 +2552,14 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

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];

}