| Index: chrome/browser/ui/views/profiles/user_manager_view.cc
|
| diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
|
| index 8f6a80ccd6a377c090e9a8801e9cf60eeee93d11..d0d5ad7f172a0b2ab14ae88d229f28e56623f0fa 100644
|
| --- a/chrome/browser/ui/views/profiles/user_manager_view.cc
|
| +++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/ui/browser_dialogs.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| +#include "chrome/browser/ui/user_manager.h"
|
| #include "chrome/browser/ui/views/auto_keep_alive.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -38,23 +39,22 @@ const int kWindowHeight = 700;
|
|
|
| }
|
|
|
| -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) {
|
| - UserManagerView::Show(
|
| - profile_path_to_focus, profiles::USER_MANAGER_NO_TUTORIAL);
|
| -}
|
| -
|
| -void ShowUserManagerWithTutorial(profiles::UserManagerTutorialMode tutorial) {
|
| - UserManagerView::Show(base::FilePath(), tutorial);
|
| +void UserManager::Show(
|
| + const base::FilePath& profile_path_to_focus,
|
| + profiles::UserManagerTutorialMode tutorial_mode,
|
| + profiles::UserManagerProfileSelected profile_open_action) {
|
| + UserManagerView::Show(profile_path_to_focus,
|
| + tutorial_mode,
|
| + profile_open_action);
|
| }
|
|
|
| -void HideUserManager() {
|
| +void UserManager::Hide() {
|
| UserManagerView::Hide();
|
| }
|
|
|
| -} // namespace chrome
|
| +bool UserManager::IsShowing() {
|
| + return UserManagerView::IsShowing();
|
| +}
|
|
|
| // static
|
| UserManagerView* UserManagerView::instance_ = NULL;
|
| @@ -68,8 +68,10 @@ UserManagerView::~UserManagerView() {
|
| }
|
|
|
| // static
|
| -void UserManagerView::Show(const base::FilePath& profile_path_to_focus,
|
| - profiles::UserManagerTutorialMode tutorial_mode) {
|
| +void UserManagerView::Show(
|
| + const base::FilePath& profile_path_to_focus,
|
| + profiles::UserManagerTutorialMode tutorial_mode,
|
| + profiles::UserManagerProfileSelected profile_open_action) {
|
| ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::OPEN_USER_MANAGER);
|
| if (instance_) {
|
| // If there's a user manager window open already, just activate it.
|
| @@ -82,6 +84,7 @@ void UserManagerView::Show(const base::FilePath& profile_path_to_focus,
|
| profiles::CreateGuestProfileForUserManager(
|
| profile_path_to_focus,
|
| tutorial_mode,
|
| + profile_open_action,
|
| base::Bind(&UserManagerView::OnGuestProfileCreated,
|
| base::Passed(make_scoped_ptr(new UserManagerView)),
|
| profile_path_to_focus));
|
|
|