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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge Created 5 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/about_flags.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4f7e59139d26aa37ae7abc868705204dc7a39133..e708051dc2855fcc4de0b9dcdd2961ffa1e2928f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -805,8 +805,7 @@ std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
// SiteInstance URL - "chrome-guest://app_id/persist?partition".
if (site.SchemeIs(content::kGuestScheme)) {
partition_id = site.spec();
- } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL &&
- !switches::IsEnableWebviewBasedSignin()) {
+ } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) {
// Chrome signin page has an embedded iframe of extension and web content,
// thus it must be isolated from other webUI pages.
partition_id = site.GetOrigin().spec();
@@ -870,8 +869,7 @@ void ChromeContentBrowserClient::GetStoragePartitionConfigForSite(
}
#endif
- if (!success && (site.GetOrigin().spec() == kChromeUIChromeSigninURL) &&
- !switches::IsEnableWebviewBasedSignin()) {
+ if (!success && (site.GetOrigin().spec() == kChromeUIChromeSigninURL)) {
// Chrome signin page has an embedded iframe of extension and web content,
// thus it must be isolated from other webUI pages.
*partition_domain = chrome::kChromeUIChromeSigninHost;
@@ -1470,7 +1468,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kEnableOutOfProcessPdf,
switches::kEnablePluginPlaceholderShadowDom,
switches::kEnableShowModalDialog,
- switches::kEnableWebBasedSignin,
switches::kJavaScriptHarmony,
switches::kMessageLoopHistogrammer,
switches::kPlaybackMode,
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698