| Index: chrome/common/extensions/extension.h
|
| diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
|
| index f95cf18ccb55d958f634d6f881c15233c623c5f8..b844bcf3f6910d02fc86a477deb9e83ed991edd7 100644
|
| --- a/chrome/common/extensions/extension.h
|
| +++ b/chrome/common/extensions/extension.h
|
| @@ -556,6 +556,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool has_background_page() const {
|
| return background_url_.is_valid() || !background_scripts_.empty();
|
| }
|
| + bool allow_background_js_access() const {
|
| + return allow_background_js_access_;
|
| + }
|
| const std::vector<std::string>& background_scripts() const {
|
| return background_scripts_;
|
| }
|
| @@ -689,6 +692,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool LoadBackgroundPersistent(
|
| const ExtensionAPIPermissionSet& api_permissions,
|
| string16* error);
|
| + bool LoadBackgroundAllowJsAccess(
|
| + const ExtensionAPIPermissionSet& api_permissions,
|
| + string16* error);
|
|
|
| // Helper method that loads a UserScript object from a
|
| // dictionary in the content_script list of the manifest.
|
| @@ -842,6 +848,12 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // load on-demand (when it needs to handle an event). Defaults to true.
|
| bool background_page_persists_;
|
|
|
| + // True if the background page can be scripted by pages of the app or
|
| + // extension, in which case all such pages must run in the same process.
|
| + // False if such pages are not permitted to script the background page,
|
| + // allowing them to run in different processes.
|
| + bool allow_background_js_access_;
|
| +
|
| // Optional URL to a page for setting options/preferences.
|
| GURL options_url_;
|
|
|
|
|