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

Unified Diff: chrome/browser/ui/views/profiles/user_manager_view.cc

Issue 239543012: The User Manager should be backed by a special profile, not the guest one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nico's comment + fix tests Created 6 years, 8 months 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/views/profiles/user_manager_view.h ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5d305a76e502752c1aae48bd8cc989555e156628..9606516fef18f8cb453bca3a5a2fcabd62c25f7c 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -81,12 +81,12 @@ void UserManagerView::Show(const base::FilePath& profile_path_to_focus,
return;
}
- // Create the guest profile, if necessary, and open the user manager
- // from the guest profile.
- profiles::CreateGuestProfileForUserManager(
+ // Create the User Manager profile, if necessary, and open the User Manager
+ // when the profile is ready.
+ profiles::CreateUserManagerProfile(
profile_path_to_focus,
tutorial_mode,
- base::Bind(&UserManagerView::OnGuestProfileCreated));
+ base::Bind(&UserManagerView::OnUserManagerProfileCreated));
}
// static
@@ -101,9 +101,9 @@ bool UserManagerView::IsShowing() {
}
// static
-void UserManagerView::OnGuestProfileCreated(Profile* guest_profile,
- const std::string& url) {
- instance_ = new UserManagerView(guest_profile);
+void UserManagerView::OnUserManagerProfileCreated(Profile* profile,
+ const std::string& url) {
+ instance_ = new UserManagerView(profile);
DialogDelegate::CreateDialogWidget(instance_, NULL, NULL);
gfx::NativeWindow window = instance_->GetWidget()->GetNativeWindow();
@@ -112,8 +112,7 @@ void UserManagerView::OnGuestProfileCreated(Profile* guest_profile,
#if defined(OS_WIN)
// Set the app id for the task manager to the app id of its parent
ui::win::SetAppIdForWindow(
- ShellIntegration::GetChromiumModelIdForProfile(
- guest_profile->GetPath()),
+ ShellIntegration::GetChromiumModelIdForProfile(profile->GetPath()),
views::HWNDForWidget(instance_->GetWidget()));
#endif
instance_->GetWidget()->Show();
« no previous file with comments | « chrome/browser/ui/views/profiles/user_manager_view.h ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698