| 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 d3efc5969c0cc68eed885c89699c5161d48366d7..b2b55f8141b50264d1d86c4f210e36fc0326b1bd 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| @@ -1563,8 +1563,8 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| [[NSMutableArray alloc] init]);
|
| // Local and guest profiles cannot lock their profile.
|
| bool showLock = false;
|
| - bool isFastProfileChooser =
|
| - viewMode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
|
| + bool isFastProfileChooser = switches::IsMaterialDesignUserMenu() ?
|
| + false : viewMode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
|
| if (isFastProfileChooser) {
|
| // The user is using right-click switching, no need to tell them about it.
|
| PrefService* localState = g_browser_process->local_state();
|
| @@ -1601,11 +1601,9 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| CGFloat yOffset = 1;
|
|
|
| if (isFastProfileChooser) {
|
| - if (!switches::IsMaterialDesignUserMenu()) {
|
| - [self buildFastUserSwitcherViewWithProfiles:otherProfiles.get()
|
| - atYOffset:yOffset
|
| - inContainer:container];
|
| - }
|
| + [self buildFastUserSwitcherViewWithProfiles:otherProfiles.get()
|
| + atYOffset:yOffset
|
| + inContainer:container];
|
| } else {
|
| [self buildProfileChooserViewWithProfileView:currentProfileView
|
| tutorialView:tutorialView
|
|
|