| Index: chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm
|
| index ac8ab0f9d536d81904703f0f511264587bf8120d..26c3bfaec7afa1689504ce6fd9b5b69cfe207f11 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm
|
| @@ -40,12 +40,8 @@ - (id)initWithBrowser:(Browser*)browser {
|
| [container setWantsLayer:YES];
|
| [self setView:container];
|
|
|
| - bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
|
| NSRect frameRect = NSMakeRect(5, 5, profiles::kAvatarIconWidth,
|
| profiles::kAvatarIconHeight);
|
| - if (!isModeMaterial) {
|
| - frameRect.origin = NSZeroPoint;
|
| - }
|
| button_.reset([[NSButton alloc] initWithFrame:frameRect]);
|
| NSButtonCell* cell = [button_ cell];
|
| [button_ setButtonType:NSMomentaryLightButton];
|
| @@ -80,15 +76,9 @@ - (id)initWithBrowser:(Browser*)browser {
|
| l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION)
|
| forAttribute:NSAccessibilityDescriptionAttribute];
|
|
|
| - if (isModeMaterial) {
|
| - NSImage* icon = NSImageFromImageSkia(gfx::CreateVectorIcon(
|
| - gfx::VectorIconId::INCOGNITO, 24, SK_ColorWHITE));
|
| - [button_ setImage:icon];
|
| - } else {
|
| - NSImage* icon = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - IDR_OTR_ICON).ToNSImage();
|
| - [button_ setImage:[self compositeImageWithShadow:icon]];
|
| - }
|
| + NSImage* icon = NSImageFromImageSkia(
|
| + gfx::CreateVectorIcon(gfx::VectorIconId::INCOGNITO, 24, SK_ColorWHITE));
|
| + [button_ setImage:icon];
|
| [button_ setEnabled:NO];
|
|
|
| [[self view] addSubview:button_];
|
|
|