chrome/browser/profiles/profile_downloader.cc - Issue 150003004: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId.

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: chrome/browser/profiles/profile_downloader.cc

Issue 150003004: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 10 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/policy/cloud/user_policy_signin_service.cc ('k') | chrome/browser/sync_file_system/drive_backend/sync_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_downloader.cc

diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc

index 9a7a7154cd45407dc904f71e0a7ec4aa853f51de..7248e53518fadd49002e1fd32e706589a469fe6b 100644

--- a/chrome/browser/profiles/profile_downloader.cc

+++ b/chrome/browser/profiles/profile_downloader.cc

@@ -19,6 +19,8 @@

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

#include "chrome/browser/signin/profile_oauth2_token_service.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

+#include "chrome/browser/signin/signin_manager.h"

+#include "chrome/browser/signin/signin_manager_factory.h"

#include "content/public/browser/browser_thread.h"

#include "google_apis/gaia/gaia_constants.h"

#include "google_apis/gaia/gaia_urls.h"

@@ -233,8 +235,11 @@ void ProfileDownloader::StartForAccount(const std::string& account_id) {

return;

}

+ SigninManagerBase* signin_manager =

+ SigninManagerFactory::GetForProfile(delegate_->GetBrowserProfile());

account_id_ =

- account_id.empty() ? service->GetPrimaryAccountId() : account_id;

+ account_id.empty() ?

+ signin_manager->GetAuthenticatedAccountId() : account_id;

if (service->RefreshTokenIsAvailable(account_id_)) {

StartFetchingOAuth2AccessToken();

} else {