summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension_constants.cc
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 04:51:52 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 04:51:52 +0000
commit41f4ee1d7b91482973e79eb6c9322c4560e38683 (patch)
tree70dc9d444ff912564e1229e2a5f928c3c88b4538 /chrome/common/extensions/extension_constants.cc
parenta7547fbd46960eb25d9d3e525171a64391f0fd31 (diff)
downloadchromium_src-41f4ee1d7b91482973e79eb6c9322c4560e38683.zip
chromium_src-41f4ee1d7b91482973e79eb6c9322c4560e38683.tar.gz
chromium_src-41f4ee1d7b91482973e79eb6c9322c4560e38683.tar.bz2
Support both href and path keyword for extension path
BUG=111988 TEST=ExtensionManifestTest.WebIntents Review URL: http://codereview.chromium.org/9592013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_constants.cc')
-rw-r--r--chrome/common/extensions/extension_constants.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 868dc3c..0065870 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -44,11 +44,12 @@ const char kId[] = "id";
const char kIncognito[] = "incognito";
const char kIncludeGlobs[] = "include_globs";
const char kInputComponents[] = "input_components";
-const char kIntents[] = "intents";
-const char kIntentType[] = "type";
+const char kIntentDisposition[] = "disposition";
+const char kIntentHref[] = "href";
const char kIntentPath[] = "path";
+const char kIntents[] = "intents";
const char kIntentTitle[] = "title";
-const char kIntentDisposition[] = "disposition";
+const char kIntentType[] = "type";
const char kIsolation[] = "app.isolation";
const char kJs[] = "js";
const char kKey[] = "key";
@@ -264,10 +265,13 @@ const char kInvalidIntent[] =
"Invalid value for intents[*]";
const char kInvalidIntentDisposition[] =
"Invalid value for intents[*].disposition";
-const char kInvalidIntentPath[] =
- "Invalid value for intents[*].path";
+const char kInvalidIntentHref[] =
+ "Invalid value for intents[*].href";
+const char kInvalidIntentHrefOldAndNewKey[] =
+ "intents[*]: Key \"*\" is deprecated. Key \"*\" has the same meaning. "
+ "You can not use both.";
const char kInvalidIntentPageInHostedApp[] =
- "Invalid value for intents[*].path. Hosted apps must specify an "
+ "Invalid value for intents[*].href. Hosted apps must specify an "
"absolute URL within app.urls[].";
const char kInvalidIntents[] =
"Invalid value for intents";