| Index: chrome/common/extensions/extension.h
|
| diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
|
| index dfb6846f137bbb2e5742e1e0ff84190b01cd6875..c8755685deb3a544bf45ef2637e59dd09550a236 100644
|
| --- a/chrome/common/extensions/extension.h
|
| +++ b/chrome/common/extensions/extension.h
|
| @@ -470,21 +470,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| const std::vector<NaClModuleInfo>& nacl_modules() const {
|
| return nacl_modules_;
|
| }
|
| - 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_;
|
| - }
|
| - bool has_persistent_background_page() const {
|
| - return has_background_page() && background_page_is_persistent_;
|
| - }
|
| - bool has_lazy_background_page() const {
|
| - return has_background_page() && !background_page_is_persistent_;
|
| - }
|
| const PermissionSet* optional_permission_set() const {
|
| return optional_permission_set_.get();
|
| }
|
| @@ -496,6 +481,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| APIPermissionSet* initial_api_permissions() {
|
| return initial_api_permissions_.get();
|
| }
|
| + const APIPermissionSet* initial_api_permissions() const {
|
| + return initial_api_permissions_.get();
|
| + }
|
| // Appends |new_warning[s]| to install_warnings_.
|
| void AddInstallWarning(const InstallWarning& new_warning);
|
| void AddInstallWarnings(const std::vector<InstallWarning>& new_warnings);
|
| @@ -542,8 +530,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool is_content_pack() const;
|
| ExtensionResource GetContentPackSiteList() const;
|
|
|
| - GURL GetBackgroundURL() const;
|
| -
|
| private:
|
| friend class base::RefCountedThreadSafe<Extension>;
|
|
|
| @@ -627,13 +613,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // Must be called after LoadPlugins().
|
| bool LoadRequirements(string16* error);
|
| bool LoadOfflineEnabled(string16* error);
|
| - bool LoadBackgroundScripts(string16* error);
|
| - bool LoadBackgroundScripts(const std::string& key, string16* error);
|
| - bool LoadBackgroundPage(string16* error);
|
| - bool LoadBackgroundPage(const std::string& key,
|
| - string16* error);
|
| - bool LoadBackgroundPersistent(string16* error);
|
| - bool LoadBackgroundAllowJSAccess(string16* error);
|
| bool LoadExtensionFeatures(string16* error);
|
| bool LoadContentScripts(string16* error);
|
| bool LoadBrowserAction(string16* error);
|
| @@ -774,24 +753,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // "allow-same-origin" token).
|
| std::string sandboxed_pages_content_security_policy_;
|
|
|
| - // Optional URL to a master page of which a single instance should be always
|
| - // loaded in the background.
|
| - GURL background_url_;
|
| -
|
| - // Optional list of scripts to use to generate a background page. If this is
|
| - // present, background_url_ will be empty and generated by GetBackgroundURL().
|
| - std::vector<std::string> background_scripts_;
|
| -
|
| - // True if the background page should stay loaded forever; false if it should
|
| - // load on-demand (when it needs to handle an event). Defaults to true.
|
| - bool background_page_is_persistent_;
|
| -
|
| - // 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_;
|
| -
|
| // The public key used to sign the contents of the crx package.
|
| std::string public_key_;
|
|
|
|
|