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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 8585016: Don't use process isolation for bookmark apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug with old_url. Created 9 years, 1 month 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 5c821bbc0a354174a22762346ff042ed185d69d6..b7dc4b64d998a6f1f5586b1291a689c96b7a642a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -351,6 +351,11 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
if (!extension)
return url;
+ // Bookmark apps do not use the hosted app process model, and should be
+ // treated as normal URLs.
+ if (extension->from_bookmark())
+ return url;
+
// If the URL is part of an extension's web extent, convert it to an
// extension URL.
return extension->GetResourceURL(url.path());
@@ -359,8 +364,8 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
content::BrowserContext* browser_context, const GURL& effective_url) {
// Non-extension URLs should generally use process-per-site-instance.
- // Because we expect to use the effective URL, hosted apps URLs should have
- // an extension scheme by now.
+ // Because we expect to use the effective URL, URLs for hosted apps (apart
+ // from bookmark apps) should have an extension scheme by now.
if (!effective_url.SchemeIs(chrome::kExtensionScheme))
return false;
« no previous file with comments | « no previous file | chrome/browser/extensions/app_process_apitest.cc » ('j') | chrome/browser/extensions/app_process_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698