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

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 1866813002: Remove StartupUtils::IsWebviewSigninEnabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 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
Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 75857a27ee4f02687613ed3a29605d82ede9a14a..e577899b2764836c7ad2839a7626543700b294a1 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1542,17 +1542,10 @@ net::URLRequestContextGetter*
UserSessionManager::GetAuthRequestContext() const {
net::URLRequestContextGetter* auth_request_context = nullptr;
achuithb 2016/04/07 18:39:48 Get rid of auth_request_context
jdufault 2016/12/07 00:27:55 Done.
- if (StartupUtils::IsWebviewSigninEnabled()) {
- // Webview uses different partition storage than iframe. We need to get
- // cookies from the right storage for url request to get auth token into
- // session.
- content::StoragePartition* signin_partition = login::GetSigninPartition();
- if (signin_partition)
- auth_request_context = signin_partition->GetURLRequestContext();
- } else if (authenticator_.get() && authenticator_->authentication_context()) {
- auth_request_context =
- authenticator_->authentication_context()->GetRequestContext();
- }
+ content::StoragePartition* signin_partition = login::GetSigninPartition();
+ if (signin_partition)
achuithb 2016/04/07 18:39:48 invert and return nullptr
jdufault 2016/12/07 00:27:55 Done.
+ auth_request_context = signin_partition->GetURLRequestContext();
achuithb 2016/04/07 18:39:48 return
jdufault 2016/12/07 00:27:55 Done.
+
return auth_request_context;
}
@@ -1756,7 +1749,7 @@ void UserSessionManager::SendUserPodsMetrics() {
}
void UserSessionManager::OnOAuth2TokensFetched(UserContext context) {
- if (StartupUtils::IsWebviewSigninEnabled() && TokenHandlesEnabled()) {
+ if (TokenHandlesEnabled()) {
achuithb 2016/04/07 18:39:48 Invert and return early
jdufault 2016/12/07 00:27:55 Done.
CreateTokenUtilIfMissing();
if (token_handle_util_->ShouldObtainHandle(context.GetAccountId())) {
token_handle_fetcher_.reset(new TokenHandleFetcher(

Powered by Google App Engine
This is Rietveld 408576698