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

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

Issue 2552423002: [Mac] Fix for avatar button active state (Closed)
Patch Set: Removed the Fast Chooser Profile Menu code in cocoa Created 4 years 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
Index: chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
index 3d8710d44f4dccf8ba35afb1b2f9afd019ff0189..548854d9b0d2615ff911b2c02a2fc4e787e7d855 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
@@ -172,13 +172,6 @@ bool ProfileUpdateObserver::HasAvatarError() {
profiles::TutorialMode tutorialMode;
profiles::BubbleViewModeFromAvatarBubbleMode(
mode, &viewMode, &tutorialMode);
- // Don't start creating the view if it would be an empty fast user switcher.
- // It has to happen here to prevent the view system from creating an empty
- // container.
- if (viewMode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER &&
- !profiles::HasProfileSwitchTargets(browser_->profile())) {
- return;
- }
menuController_ =
[[ProfileChooserController alloc] initWithBrowser:browser_
@@ -198,29 +191,9 @@ bool ProfileUpdateObserver::HasAvatarError() {
ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
}
-- (BOOL)isCtrlPressed {
- return [NSEvent modifierFlags] & NSControlKeyMask ? YES : NO;
-}
-
- (IBAction)buttonClicked:(id)sender {
- BrowserWindow::AvatarBubbleMode mode =
- BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT;
- if ([self isCtrlPressed])
- mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH;
-
- [self showAvatarBubbleAnchoredAt:button_
- withMode:mode
- withServiceType:signin::GAIA_SERVICE_TYPE_NONE
- fromAccessPoint:signin_metrics::AccessPoint::
- ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN];
-}
-
-- (IBAction)buttonRightClicked:(id)sender {
- BrowserWindow::AvatarBubbleMode mode =
- BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH;
-
[self showAvatarBubbleAnchoredAt:button_
- withMode:mode
+ withMode:BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT
withServiceType:signin::GAIA_SERVICE_TYPE_NONE
fromAccessPoint:signin_metrics::AccessPoint::
ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN];

Powered by Google App Engine
This is Rietveld 408576698