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

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

Issue 7328029: Use process-per-app-instance for hosted apps without background permission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix incognito function. Created 9 years, 5 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/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 5748626e86709090627222e04a809149ec7287ad..8449ce375ade263bca33f26faf672eaee4c379f0 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2171,12 +2171,16 @@ const Extension* ExtensionService::GetExtensionByWebExtent(const GURL& url) {
}
bool ExtensionService::ExtensionBindingsAllowed(const GURL& url) {
- // Allow bindings for all packaged extension.
- if (GetExtensionByURL(url))
+ // Allow bindings for all packaged extensions.
+ // Note that GetExtensionByURL may return an Extension for hosted apps
+ // if the URL came from GetEffectiveURL.
+ const Extension* extension = GetExtensionByURL(url);
+ if (extension && extension->GetType() != Extension::TYPE_HOSTED_APP)
return true;
// Allow bindings for all component, hosted apps.
- const Extension* extension = GetExtensionByWebExtent(url);
+ if (!extension)
+ extension = GetExtensionByWebExtent(url);
return (extension && extension->location() == Extension::COMPONENT);
}

Powered by Google App Engine
This is Rietveld 408576698