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

Unified Diff: chrome/browser/chromeos/login/helper.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/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index ae74d166e1459c219328d64c64b22a66a7b7cb44..844aaaf31c2c4094115459954cd91e19d7e48710 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -9,7 +9,6 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -229,22 +228,18 @@ content::StoragePartition* GetSigninPartition() {
}
net::URLRequestContextGetter* GetSigninContext() {
- if (StartupUtils::IsWebviewSigninEnabled()) {
- content::StoragePartition* signin_partition = GetSigninPartition();
+ content::StoragePartition* signin_partition = GetSigninPartition();
- // Special case for unit tests. There's no LoginDisplayHost thus no
- // webview instance. TODO(nkostylev): Investigate if there's a better
- // place to address this like dependency injection. http://crbug.com/477402
- if (!signin_partition && !LoginDisplayHost::default_host())
- return ProfileHelper::GetSigninProfile()->GetRequestContext();
+ // Special case for unit tests. There's no LoginDisplayHost thus no
+ // webview instance. TODO(nkostylev): Investigate if there's a better
achuithb 2016/04/07 18:39:48 Replace nkostylev with dzhioev
jdufault 2016/12/07 00:27:55 Hmm, any idea on a better owner now? I can assign
achuithb 2016/12/07 00:37:09 Let's just get rid of the TODO. I don't think anyo
+ // place to address this like dependency injection. http://crbug.com/477402
+ if (!signin_partition && !LoginDisplayHost::default_host())
+ return ProfileHelper::GetSigninProfile()->GetRequestContext();
- if (!signin_partition)
- return nullptr;
-
- return signin_partition->GetURLRequestContext();
- }
+ if (!signin_partition)
+ return nullptr;
- return ProfileHelper::GetSigninProfile()->GetRequestContext();
+ return signin_partition->GetURLRequestContext();
}
} // namespace login

Powered by Google App Engine
This is Rietveld 408576698