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

Unified Diff: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Issue 2850793005: Remove command line/field trial support and configs for Isolate Extensions. (Closed)
Patch Set: Rebase. 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/extensions/chrome_content_browser_client_extensions_part.cc
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index 5ade75a38f920848d783a8d27b94d7bbec945838..7f26e93619c0c9cca1bd1bd08278fa15f5f190a2 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -323,27 +323,23 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldUseProcessPerSite(
bool ChromeContentBrowserClientExtensionsPart::DoesSiteRequireDedicatedProcess(
content::BrowserContext* browser_context,
const GURL& effective_site_url) {
- if (IsIsolateExtensionsEnabled()) {
- const Extension* extension =
- ExtensionRegistry::Get(browser_context)
- ->enabled_extensions()
- .GetExtensionOrAppByURL(effective_site_url);
- if (extension) {
- // Always isolate Chrome Web Store.
- if (extension->id() == kWebStoreAppId)
- return true;
-
- // --isolate-extensions should isolate extensions, except for hosted
- // apps. Isolating hosted apps is a good idea, but ought to be a separate
- // knob.
- if (extension->is_hosted_app())
- return false;
-
- // Isolate all extensions.
- return true;
- }
- }
- return false;
+ const Extension* extension = ExtensionRegistry::Get(browser_context)
+ ->enabled_extensions()
+ .GetExtensionOrAppByURL(effective_site_url);
+ if (!extension)
+ return false;
+
+ // Always isolate Chrome Web Store.
+ if (extension->id() == kWebStoreAppId)
+ return true;
+
+ // Extensions should be isolated, except for hosted apps. Isolating hosted
+ // apps is a good idea, but ought to be a separate knob.
+ if (extension->is_hosted_app())
+ return false;
+
+ // Isolate all extensions.
+ return true;
}
// static
@@ -363,8 +359,8 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldLockToOrigin(
// http://crbug.com/600441 workaround: Extension process reuse, implemented
// in ShouldTryToUseExistingProcessHost(), means that extension processes
- // aren't always actually dedicated to a single origin, even in
- // --isolate-extensions. TODO(nick): Fix this.
+ // aren't always actually dedicated to a single origin.
+ // TODO(nick): Fix this.
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kSitePerProcess))
return false;

Powered by Google App Engine
This is Rietveld 408576698