summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 20:24:28 +0000
committerwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 20:24:28 +0000
commit16c2e79f5cdc896372b0a6ccf471f2a45a206c46 (patch)
tree00a03f187c048656663a442bf21e1238df1e22da /extensions
parentc89271d8ecaab76fd7bf0f9f7b9c2d3593d5bee9 (diff)
downloadchromium_src-16c2e79f5cdc896372b0a6ccf471f2a45a206c46.zip
chromium_src-16c2e79f5cdc896372b0a6ccf471f2a45a206c46.tar.gz
chromium_src-16c2e79f5cdc896372b0a6ccf471f2a45a206c46.tar.bz2
Rename and deprecate chrome_settings_overrides.bookmarks_ui.hide_bookmark_button key
As discussed in comments on the Remove Bookmark Shortcut extension API proposal: https://docs.google.com/a/chromium.org/document/d/1C2Mle92O9uGlji5y5gGDM5tNJ_tVE1Vb-2xgsZPNDTk BUG=335655 Review URL: https://codereview.chromium.org/145173003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/manifest_constants.cc3
-rw-r--r--extensions/common/manifest_constants.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 9e59b44..eedce2b 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -109,6 +109,7 @@ const char kPlugins[] = "plugins";
const char kPluginsPath[] = "path";
const char kPluginsPublic[] = "public";
const char kPublicKey[] = "key";
+const char kRemoveButton[] = "remove_button";
const char kResources[] = "resources";
const char kRequirements[] = "requirements";
const char kRunAt[] = "run_at";
@@ -631,6 +632,8 @@ const char kInsecureContentSecurityPolicy[] =
" \"'unsafe-eval'\", \"http://127.0.0.1\", \"http://localhost\", or any"
" \"https://\" or \"chrome-extension://\" origin. For more information,"
" see http://developer.chrome.com/extensions/contentSecurityPolicy.html";
+const char kKeyIsDeprecatedWithReplacement[] =
+ "Key \"*\" is deprecated. Key \"*\" should be used instead.";
const char kLaunchPathAndExtentAreExclusive[] =
"The 'app.launch.local_path' and 'app.urls' keys cannot both be set.";
const char kLaunchPathAndURLAreExclusive[] =
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index 5552b1f..9e10cdd 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -118,6 +118,7 @@ extern const char kPlugins[];
extern const char kPluginsPath[];
extern const char kPluginsPublic[];
extern const char kPublicKey[];
+extern const char kRemoveButton[];
extern const char kResources[];
extern const char kRequirements[];
extern const char kRunAt[];
@@ -426,6 +427,7 @@ extern const char kInvalidWebURL[];
extern const char kInvalidWebURLs[];
extern const char kInvalidZipHash[];
extern const char kInsecureContentSecurityPolicy[];
+extern const char kKeyIsDeprecatedWithReplacement[];
extern const char kLaunchPathAndExtentAreExclusive[];
extern const char kLaunchPathAndURLAreExclusive[];
extern const char kLaunchURLRequired[];