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 a9c79916295aebbe951282d1dd1d33ce3c33d9ba..8c294af375dd00cc3ce6d38ac1b5e25b1c90eb0f 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -768,14 +768,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(); |
- } |
Roger Tawa OOO till Jul 10th
2015/10/30 14:58:15
kChromeUIChromeSigninURL is only used on desktop,
achuithb
2015/11/05 22:36:49
Acknowledged.
|
DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
return partition_id; |
@@ -804,9 +798,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)) { |
@@ -835,14 +828,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; |
- } |
- |
Roger Tawa OOO till Jul 10th
2015/10/30 14:58:15
kChromeUIChromeSigninURL is only used on desktop,
achuithb
2015/11/05 22:36:50
Acknowledged.
|
// 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 |