Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3265)

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

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm ('k') | chrome/browser/ui/libgtkui/gtk_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 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
« no previous file with comments | « chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm ('k') | chrome/browser/ui/libgtkui/gtk_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698