Don't use process isolation for bookmark apps.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 716 matching lines @@
 void ChromeContentRendererClient::SetExtensionDispatcher(
     ExtensionDispatcher* extension_dispatcher) {
   extension_dispatcher_.reset(extension_dispatcher);
 }
 
 bool ChromeContentRendererClient::CrossesExtensionExtents(
     WebFrame* frame,
     const GURL& new_url,
     bool is_initial_navigation) {
   const ExtensionSet* extensions = extension_dispatcher_->extensions();
-  bool is_extension_url = !!extensions->GetByURL(new_url);
+
+  // Determine if the new URL is an extension.
+  // Exclude bookmark apps, which do not use the app process model.
   GURL old_url(frame->top()->document().url());
+  const Extension* new_url_extension = extensions->GetByURL(new_url);

[Aaron Boodman, 2011/11/18 18:19:52]

Pull this into a helper, so that you don't have to repeat it? Alternatively, you
could add optional flags to GetByURL() and have one like EXCLUDE_BOOKMARK_APPS.

[Charlie Reis, 2011/11/18 19:45:42]

Done.

+  if (new_url_extension && new_url_extension->from_bookmark())
+    new_url_extension = NULL;
 
   // If old_url is still empty and this is an initial navigation, then this is
   // a window.open operation.  We should look at the opener URL.
   if (is_initial_navigation && old_url.is_empty() && frame->opener()) {
     // If we're about to open a normal web page from a same-origin opener stuck
     // in an extension process, we want to keep it in process to allow the
     // opener to script it.
     GURL opener_url = frame->opener()->document().url();
     bool opener_is_extension_url = !!extensions->GetByURL(opener_url);
     WebSecurityOrigin opener = frame->opener()->document().securityOrigin();
-    if (!is_extension_url &&
+    if (!new_url_extension &&
         !opener_is_extension_url &&
         extension_dispatcher_->is_extension_process() &&
         opener.canRequest(WebURL(new_url)))
       return false;
 
     // In all other cases, we want to compare against the top frame's URL (as
     // opposed to the opener frame's), since that's what determines the type of
     // process.  This allows iframes outside an app to open a popup in the app.
     old_url = frame->top()->opener()->top()->document().url();
   }
 
+  // Determine if the old URL is an extension (excluding bookmark apps).
+  const Extension* old_url_extension = extensions->GetByURL(old_url);
+  if (old_url_extension && old_url_extension->from_bookmark())
+    old_url_extension = NULL;
+
   // TODO(creis): Temporary workaround for crbug.com/59285: Only return true if
   // we would enter an extension app's extent from a non-app, or if we leave an
   // extension with no web extent.  We avoid swapping processes to exit a hosted
   // app for now, since we do not yet support postMessage calls from outside the
   // app back into it (e.g., as in Facebook OAuth 2.0).
-  bool old_url_is_hosted_app = extensions->GetByURL(old_url) &&
-       !extensions->GetByURL(old_url)->web_extent().is_empty();
-  return !extensions->InSameExtent(old_url, new_url) &&
-         !old_url_is_hosted_app;
+  bool old_url_is_hosted_app = old_url_extension &&
+      !old_url_extension->web_extent().is_empty();
+  if (old_url_is_hosted_app)
+    return false;
+
+  return old_url_extension != new_url_extension;
 }
 
 void ChromeContentRendererClient::OnPurgeMemory() {
   DVLOG(1) << "Resetting spellcheck in renderer client";
   RenderThread* thread = RenderThread::Get();
   if (spellcheck_.get())
     thread->RemoveObserver(spellcheck_.get());
   SpellCheck* new_spellcheck = new SpellCheck();
   if (spellcheck_provider_)
     spellcheck_provider_->SetSpellCheck(new_spellcheck);
@@ skipping 22 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome