Allow apps with background pages to request process-per-app-instance.

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1415 matching lines @@
   }
 
   if (!has_background_page()) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage);
     return false;
   }
 
   return true;
 }
 
+bool Extension::LoadBackgroundAllowJsAccess(

[Mihai Parparita -not on Chrome, 2012/03/01 02:48:11]

I'm assuming you based this on LoadBackgroundPersistent, but a simpler approach
than Get/IsType/GetAsBoolean is to use HasKey and GetBoolean (both on
DictionaryValue) directly.

[Charlie Reis, 2012/03/01 20:12:12]

I'm not sure I follow what you want.  I can't call HasKey and GetBoolean on
manifest_, because ManifestFeatureProvider complains.  If I call them on the
DictionaryValue for "background", then I first have to retrieve the "background"
value using manifest_->Get, and I have to rename the key from
"background.allow_js_access" to "allow_js_access" (arguably less clear).  I'm ok
either way, but it's not clear to me that's an improvement.

[Mihai Parparita -not on Chrome, 2012/03/02 01:10:06]

Ah, hadn't realized that ManifestFeatureProvider doesn't allow the direct
HasKey/GetBoolean check. Seems fine as is then.

+    const ExtensionAPIPermissionSet& api_permissions,
+    string16* error) {
+  Value* allow_js_access = NULL;
+  if (!manifest_->Get(keys::kBackgroundAllowJsAccess, &allow_js_access))
+    return true;
+
+  if (!allow_js_access->IsType(Value::TYPE_BOOLEAN) ||
+      !allow_js_access->GetAsBoolean(&allow_background_js_access_)) {
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundAllowJsAccess);
+    return false;
+  }
+
+  if (!has_background_page()) {
+    *error = ASCIIToUTF16(errors::kInvalidBackgroundAllowJsAccessNoPage);
+    return false;
+  }
+
+  return true;
+}
+
 // static
 bool Extension::IsTrustedId(const std::string& id) {
   // See http://b/4946060 for more details.
   return id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
 }
 
 Extension::Extension(const FilePath& path,
                      scoped_ptr<extensions::Manifest> manifest)
     : manifest_version_(0),
       incognito_split_mode_(false),
       offline_enabled_(false),
       converted_from_user_script_(false),
       background_page_persists_(true),
+      allow_background_js_access_(true),
       manifest_(manifest.release()),
       is_storage_isolated_(false),
       launch_container_(extension_misc::LAUNCH_TAB),
       launch_width_(0),
       launch_height_(0),
       wants_file_access_(false),
       creation_flags_(0) {
   DCHECK(path.empty() || path.IsAbsolute());
   path_ = MaybeNormalizePath(path);
 }
@@ skipping 773 matching lines @@
 
   if (!LoadBackgroundScripts(error))
     return false;
 
   if (!LoadBackgroundPage(api_permissions, error))
     return false;
 
   if (!LoadBackgroundPersistent(api_permissions, error))
     return false;
 
+  if (!LoadBackgroundAllowJsAccess(api_permissions, error))
+    return false;
+
   if (manifest_->HasKey(keys::kDefaultLocale)) {
     if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) ||
         !l10n_util::IsValidLocaleSyntax(default_locale_)) {
       *error = ASCIIToUTF16(errors::kInvalidDefaultLocale);
       return false;
     }
   }
 
   // Chrome URL overrides (optional)
   if (manifest_->HasKey(keys::kChromeURLOverrides)) {
@@ skipping 987 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}