| Index: chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| index 957d95ba57bb6b8b04cab3e077f8fa47836a668c..0dc23d1ea1f608ad5ecff443feabad91fd59fe32 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| @@ -27,12 +27,27 @@ namespace chrome {
|
|
|
| // Declared in browser_dialogs.h so others don't have to depend on this header.
|
| void ShowUserManager(const base::FilePath& profile_path_to_focus) {
|
| - UserManagerMac::Show(
|
| - profile_path_to_focus, profiles::USER_MANAGER_NO_TUTORIAL);
|
| + UserManagerMac::Show(profile_path_to_focus,
|
| + profiles::USER_MANAGER_NO_TUTORIAL,
|
| + profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
|
| }
|
|
|
| void ShowUserManagerWithTutorial(profiles::UserManagerTutorialMode tutorial) {
|
| - UserManagerMac::Show(base::FilePath(), tutorial);
|
| + UserManagerMac::Show(base::FilePath(),
|
| + tutorial,
|
| + profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
|
| +}
|
| +
|
| +void ShowUserManagerThenTaskManager() {
|
| + UserManagerMac::Show(base::FilePath(),
|
| + profiles::USER_MANAGER_NO_TUTORIAL,
|
| + profiles::USER_MANAGER_SELECT_PROFILE_TASK_MANAGER);
|
| +}
|
| +
|
| +void ShowUserManagerThenAboutChrome() {
|
| + UserManagerMac::Show(base::FilePath(),
|
| + profiles::USER_MANAGER_NO_TUTORIAL,
|
| + profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME);
|
| }
|
|
|
| void HideUserManager() {
|
| @@ -175,8 +190,10 @@ UserManagerMac::~UserManagerMac() {
|
| }
|
|
|
| // static
|
| -void UserManagerMac::Show(const base::FilePath& profile_path_to_focus,
|
| - profiles::UserManagerTutorialMode tutorial_mode) {
|
| +void UserManagerMac::Show(
|
| + const base::FilePath& profile_path_to_focus,
|
| + profiles::UserManagerTutorialMode tutorial_mode,
|
| + profiles::UserManagerProfileSelected profile_open_action) {
|
| if (instance_) {
|
| // If there's a user manager window open already, just activate it.
|
| [instance_->window_controller_ show];
|
| @@ -188,6 +205,7 @@ void UserManagerMac::Show(const base::FilePath& profile_path_to_focus,
|
| profiles::CreateGuestProfileForUserManager(
|
| profile_path_to_focus,
|
| tutorial_mode,
|
| + profile_open_action,
|
| base::Bind(&UserManagerMac::OnGuestProfileCreated));
|
| }
|
|
|
|
|