Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm |
| index 76d5e19ce4c0596e4d58f854487ae58a0e004270..5822b5fe8169e730ad95b12f7aa6e2638739004a 100644 |
| --- a/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm |
| +++ b/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm |
| @@ -32,6 +32,7 @@ |
| #include "chrome/browser/ui/chrome_style.h" |
| #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
| +#import "chrome/browser/ui/cocoa/user_manager_mac.h" |
| #include "chrome/browser/ui/singleton_tabs.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/common/url_constants.h" |
| @@ -585,20 +586,17 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver, |
| - (IBAction)switchToProfile:(id)sender { |
| // Check the event flags to see if a new window should be created. |
| - bool always_create = ui::WindowOpenDispositionFromNSEvent( |
| + bool alwaysCreate = ui::WindowOpenDispositionFromNSEvent( |
| [NSApp currentEvent]) == NEW_WINDOW; |
| - avatarMenu_->SwitchToProfile([sender tag], always_create, |
| + avatarMenu_->SwitchToProfile([sender tag], alwaysCreate, |
| ProfileMetrics::SWITCH_PROFILE_ICON); |
| } |
| - (IBAction)showUserManager:(id)sender { |
| - // Only non-guest users appear in the User Manager. |
| - base::FilePath profile_path; |
| - if (!isGuestSession_) { |
| - size_t active_index = avatarMenu_->GetActiveProfileIndex(); |
| - profile_path = avatarMenu_->GetItemAt(active_index).profile_path; |
| - } |
| - chrome::ShowUserManager(profile_path); |
| + // Only non-guest users appear in the User Manager, or can display a |
|
msw
2014/03/20 18:51:26
nit: consider "Guest users cannot appear in the Us
noms (inactive)
2014/03/20 20:28:20
Done.
|
| + // tutorial. |
| + profiles::ShowUserManagerMaybeWithTutorial( |
| + isGuestSession_ ? NULL : browser_->profile()); |
| } |
| - (IBAction)switchToGuestProfile:(id)sender { |
| @@ -1212,4 +1210,3 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver, |
| return label.autorelease(); |
| } |
| @end |
| - |