components/enhanced_bookmarks/bookmark_server_service.cc - Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id.

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: components/enhanced_bookmarks/bookmark_server_service.cc

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review comments Created 6 years, 2 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

« chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('K') | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | components/signin/core/browser/mutable_profile_oauth2_token_service.h » ('j') | components/signin/core/browser/signin_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/enhanced_bookmarks/bookmark_server_service.cc

diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc

index b6bd5833ca84001a409a85ed8a99375ed54ae918..66ba670815c2ebdd43f6e9306768660914d1eeba 100644

--- a/components/enhanced_bookmarks/bookmark_server_service.cc

+++ b/components/enhanced_bookmarks/bookmark_server_service.cc

@@ -71,8 +71,7 @@ void BookmarkServerService::TriggerTokenRequest(bool cancel_previous) {

if (token_request_ || url_fetcher_)

return; // Fetcher is already running.

- const std::string username(signin_manager_->GetAuthenticatedUsername());

- if (!username.length()) {

+ if (!signin_manager_->IsAuthenticated()) {

// User is not signed in.

CleanAfterFailure();

Notify();

@@ -81,7 +80,8 @@ void BookmarkServerService::TriggerTokenRequest(bool cancel_previous) {

// Find a token.

OAuth2TokenService::ScopeSet scopes;

scopes.insert(GaiaConstants::kChromeSyncOAuth2Scope);

- token_request_ = token_service_->StartRequest(username, scopes, this);

+ token_request_ = token_service_->StartRequest(

+ signin_manager_->GetAuthenticatedAccountId(), scopes, this);

}