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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1412453002: Remove enable-iframe-based-signin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed uneeded code Created 5 years 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/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8328723ffcebe2bdbc18e062cc925547bf4d9b57..e0ef5f7f4d4d93b02f8326e017d0cfaa6f1a8e49 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -807,14 +807,8 @@ std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
// The partition ID for webview guest processes is the string value of its
// SiteInstance URL - "chrome-guest://app_id/persist?partition".
- if (site.SchemeIs(content::kGuestScheme)) {
+ if (site.SchemeIs(content::kGuestScheme))
partition_id = site.spec();
- } else if (!switches::IsEnableWebviewBasedSignin() &&
- site.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL) {
- // The non-webview 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();
- }
DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
return partition_id;
@@ -843,9 +837,8 @@ void ChromeContentBrowserClient::GetStoragePartitionConfigForSite(
partition_name->clear();
*in_memory = false;
- bool success = false;
#if defined(ENABLE_EXTENSIONS)
- success = extensions::WebViewGuest::GetGuestPartitionConfigForSite(
+ bool success = extensions::WebViewGuest::GetGuestPartitionConfigForSite(
site, partition_domain, partition_name, in_memory);
if (!success && site.SchemeIs(extensions::kExtensionScheme)) {
@@ -874,14 +867,6 @@ void ChromeContentBrowserClient::GetStoragePartitionConfigForSite(
}
#endif
- if (!success &&
- (!switches::IsEnableWebviewBasedSignin() &&
- site.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL)) {
- // The non-webview 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;
- }
-
// Assert that if |can_be_default| is false, the code above must have found a
// non-default partition. If this fails, the caller has a serious logic
// error about which StoragePartition they expect to be in and it is not

Powered by Google App Engine
This is Rietveld 408576698