Merge 131370 - Don't recreate background windows when allow_js_access if false

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 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/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2321 matching lines @@
 
   // Ensure that we're trying to open this from the extension's process.
   SiteInstance* opener_site_instance = opener_web_contents->GetSiteInstance();
   extensions::ProcessMap* process_map = extensions_service->process_map();
   if (!opener_site_instance->GetProcess() ||
       !process_map->Contains(
           extension->id(), opener_site_instance->GetProcess()->GetID())) {
     return false;
   }
 
-  // Only allow a single background contents per app. If one already exists,
-  // close it (even if it was specified in the manifest).
+  // Only allow a single background contents per app.
+  bool allow_js_access = extension->allow_background_js_access();
   BackgroundContents* existing =
       service->GetAppBackgroundContents(ASCIIToUTF16(extension->id()));
   if (existing) {
+    // For non-scriptable background contents, ignore the request altogether,
+    // (returning true, so that a regular WebContents isn't created either).
+    if (!allow_js_access)
+      return true;
+    // For scriptable background pages, if one already exists, close it (even
+    // if it was specified in the manifest).
     DLOG(INFO) << "Closing existing BackgroundContents for " << opener_url;
     delete existing;
   }
 
   // If script access is not allowed, create the the background contents in a
   // new SiteInstance, so that a separate process is used.
-  bool allow_js_access = extension->allow_background_js_access();
   scoped_refptr<content::SiteInstance> site_instance =
       allow_js_access ?
       opener_site_instance :
       content::SiteInstance::Create(opener_web_contents->GetBrowserContext());
 
   // Passed all the checks, so this should be created as a BackgroundContents.
   BackgroundContents* contents = service->CreateBackgroundContents(
       site_instance,
       route_id,
       profile_,
@@ skipping 3340 matching lines @@
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI(false);
   }
 #endif
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }