| Index: extensions/common/manifest_handlers/background_info.h
|
| diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h
|
| index 947ee650ab2f85accb9068e21d14f4f619195a8d..e9e360e696306160376a52b709ba8561c3bae2d7 100644
|
| --- a/extensions/common/manifest_handlers/background_info.h
|
| +++ b/extensions/common/manifest_handlers/background_info.h
|
| @@ -23,12 +23,10 @@ class BackgroundInfo : public Extension::ManifestData {
|
| static GURL GetBackgroundURL(const Extension* extension);
|
| static const std::vector<std::string>& GetBackgroundScripts(
|
| const Extension* extension);
|
| - static const std::string& GetServiceWorkerScript(const Extension* extension);
|
| static bool HasBackgroundPage(const Extension* extension);
|
| static bool HasPersistentBackgroundPage(const Extension* extension);
|
| static bool HasLazyBackgroundPage(const Extension* extension);
|
| static bool HasGeneratedBackgroundPage(const Extension* extension);
|
| - static bool HasServiceWorker(const Extension* extension);
|
| static bool AllowJSAccess(const Extension* extension);
|
|
|
| bool has_background_page() const {
|
| @@ -43,14 +41,9 @@ class BackgroundInfo : public Extension::ManifestData {
|
| return has_background_page() && !is_persistent_;
|
| }
|
|
|
| - bool has_service_worker() const { return !service_worker_script_.empty(); }
|
| -
|
| bool Parse(const Extension* extension, base::string16* error);
|
|
|
| private:
|
| - bool LoadServiceWorkerScript(const Extension* extension,
|
| - const std::string& key,
|
| - base::string16* error);
|
| bool LoadBackgroundScripts(const Extension* extension,
|
| const std::string& key,
|
| base::string16* error);
|
| @@ -74,10 +67,6 @@ class BackgroundInfo : public Extension::ManifestData {
|
| // load on-demand (when it needs to handle an event). Defaults to true.
|
| bool is_persistent_;
|
|
|
| - // Optional script to register as a service worker. This is mutually exclusive
|
| - // to the use of background_url_ or background_scripts_.
|
| - std::string service_worker_script_;
|
| -
|
| // 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,
|
|
|