trunk/src/chrome/browser/chromeos/login/login_performer.cc - Issue 14066013: Revert 194348 "Part of multiprofile implementation."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/chromeos/login/login_performer.cc

Issue 14066013: Revert 194348 "Part of multiprofile implementation." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 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 | « trunk/src/chrome/browser/chromeos/login/help_app_launcher.cc ('k') | trunk/src/chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/chromeos/login/login_performer.cc

===================================================================

--- trunk/src/chrome/browser/chromeos/login/login_performer.cc (revision 194361)

+++ trunk/src/chrome/browser/chromeos/login/login_performer.cc (working copy)

@@ -20,10 +20,11 @@

#include "chrome/browser/chromeos/login/screen_locker.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

-#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/policy/browser_policy_connector.h"

+#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "chromeos/dbus/dbus_thread_manager.h"

@@ -480,7 +481,7 @@

void LoginPerformer::StartLoginCompletion() {

DVLOG(1) << "Login completion started";

BootTimesLoader::Get()->AddLoginTimeMarker("AuthStarted", false);

- Profile* profile = ProfileHelper::GetSigninProfile();

+ Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile();

authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);

BrowserThread::PostTask(

@@ -496,7 +497,14 @@

void LoginPerformer::StartAuthentication() {

DVLOG(1) << "Auth started";

BootTimesLoader::Get()->AddLoginTimeMarker("AuthStarted", false);

- Profile* profile = ProfileHelper::GetSigninProfile();

+ Profile* profile;

+ {

+ // This should be the first place where GetDefaultProfile() is called with

+ // logged_in_ = true. This will trigger a call to Profile::CreateProfile()

+ // which requires IO access.

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

+ profile = g_browser_process->profile_manager()->GetDefaultProfile();

+ }

if (delegate_) {

authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);

BrowserThread::PostTask(