extensions/common/manifest_constants.cc - Issue 178253007: Parse manifest file with app.service_worker.script.

Unified Diff: extensions/common/manifest_constants.cc

Issue 178253007: Parse manifest file with app.service_worker.script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: destructor added Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/common/extensions/manifest_tests/extension_manifests_service_worker_unittest.cc ('K') | « extensions/common/manifest_constants.h ('k') | extensions/common/manifest_handlers/background_info.h » ('j') | extensions/common/manifest_handlers/background_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/manifest_constants.cc

diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc

index f7bf1f4bc58637d0228ad8d01688d84d51a0738e..e68ad6ba2e30984bfc9fef831be9cec574e33f10 100644

--- a/extensions/common/manifest_constants.cc

+++ b/extensions/common/manifest_constants.cc

@@ -106,6 +106,8 @@ const char kPlatformAppBackground[] = "app.background";

const char kPlatformAppBackgroundPage[] = "app.background.page";

const char kPlatformAppBackgroundScripts[] = "app.background.scripts";

const char kPlatformAppContentSecurityPolicy[] = "app.content_security_policy";

+const char kPlatformAppServiceWorker[] = "app.service_worker";

+const char kPlatformAppServiceWorkerScript[] = "app.service_worker.script";

const char kPlugins[] = "plugins";

const char kPluginsPath[] = "path";

const char kPluginsPublic[] = "public";

@@ -234,7 +236,8 @@ const char kBackgroundPermissionNeeded[] =

"Hosted apps that use 'background_page' must have the 'background' "

"permission.";

const char kBackgroundRequiredForPlatformApps[] =

- "Packaged apps must have a background page or background scripts.";

+ "Packaged apps must have background scripts, service worker, or background "

Jeffrey Yasskin 2014/02/28 01:54:37 I'd kind of like to avoid mentioning service worke

scheib 2014/03/03 19:54:00 Done. Will follow up later with http://crbug.com/3

+ "page.";

const char kCannotAccessChromeUrl[] = "Cannot access a chrome:// URL";

const char kCannotAccessExtensionUrl[] =

"Cannot access a chrome-extension:// URL of different extension";

@@ -267,8 +270,8 @@ const char kInvalidBackground[] =

const char kInvalidBackgroundAllowJsAccess[] =

"Invalid value for 'background.allow_js_access'.";

const char kInvalidBackgroundCombination[] =

- "The background.page and background.scripts properties cannot be used at "

- "the same time.";

+ "The background.page, background.scripts, and service_worker properties "

+ "cannot be used at the same time.";

const char kInvalidBackgroundScript[] =

"Invalid value for 'background.scripts[*]'.";

const char kInvalidBackgroundScripts[] =

@@ -554,6 +557,8 @@ const char kInvalidScriptBadge[] =

"Invalid value for 'script_badge'.";

const char kInvalidSearchEngineURL[] =

"Invalid URL [*] for 'chrome_settings_overrides.search_provider'.";

+const char kInvalidServiceWorkerScript[] =

+ "Invalid value for 'service_worker.script'.";

const char kInvalidEmptySettingsOverrides[] =

"Empty dictionary for 'chrome_settings_overrides'.";

const char kInvalidShortName[] =