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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2840383002: Disable top-document-isolation if the parent SiteInstance is a hosted app. (Closed)
Patch Set: Added a test. Created 3 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/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index fdfb54c56eba9160757c38517779f1cdc369ab61..8da7b0433d8399ef790c7065c53a414e8e416ab4 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1448,7 +1448,16 @@ bool ChromeContentBrowserClient::
ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
const GURL& url,
content::SiteInstance* parent_site_instance) {
- return IsNTPSiteInstance(parent_site_instance);
+ if (IsNTPSiteInstance(parent_site_instance))
+ return true;
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+ return ChromeContentBrowserClientExtensionsPart::
+ ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
+ url, parent_site_instance);
ncarter (slow) 2017/04/28 18:50:14 (nit/optional) Might be better if factored like th
+#else
+ return false;
+#endif
}
bool ChromeContentBrowserClient::IsSuitableHost(

Powered by Google App Engine
This is Rietveld 408576698