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

Unified Diff: chrome/browser/signin/signin_header_helper.cc

Issue 959013002: Remove support in ProfileIOData for one click sign in which is no longer used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocl2
Patch Set: Fix browser tests Created 5 years, 9 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/profiles/profile_io_data.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_header_helper.cc
diff --git a/chrome/browser/signin/signin_header_helper.cc b/chrome/browser/signin/signin_header_helper.cc
index 674a59f533d9e817f747b8767b55f8cbe6180d09..03872021ed57cb923a3951d244d816fedcc58a4e 100644
--- a/chrome/browser/signin/signin_header_helper.cc
+++ b/chrome/browser/signin/signin_header_helper.cc
@@ -202,10 +202,13 @@ bool AppendMirrorRequestHeaderIfPossible(
int route_id) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- if (io_data->IsOffTheRecord() ||
- io_data->google_services_username()->GetValue().empty()) {
+ if (io_data->IsOffTheRecord())
+ return false;
+
+ std::string account_id(io_data->google_services_account_id()->GetValue());
+
+ if (account_id.empty())
return false;
- }
// If signin cookies are not allowed, don't add the header.
if (!ChromeSigninClient::SettingsAllowSigninCookies(
@@ -251,8 +254,6 @@ bool AppendMirrorRequestHeaderIfPossible(
return false;
#endif // !OS_ANDROID && !OS_IOS
- std::string account_id(io_data->google_services_account_id()->GetValue());
-
int profile_mode_mask = PROFILE_MODE_DEFAULT;
if (io_data->incognito_availibility()->GetValue() ==
IncognitoModePrefs::DISABLED ||
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698