summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorvasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 14:29:58 +0000
committervasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 14:29:58 +0000
commitebdea8e4d54e897b0579598ce9503c2c44f081ff (patch)
treeba864fadf70a329fb173b8288422c50dd347def5 /extensions
parentb3dd02a2bed4bc0c3b1825874550aa7bd8f1bf2e (diff)
downloadchromium_src-ebdea8e4d54e897b0579598ce9503c2c44f081ff.zip
chromium_src-ebdea8e4d54e897b0579598ce9503c2c44f081ff.tar.gz
chromium_src-ebdea8e4d54e897b0579598ce9503c2c44f081ff.tar.bz2
Declarative settings API: parsing manifest.
BUG=267510 Review URL: https://codereview.chromium.org/27028004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/manifest_constants.cc8
-rw-r--r--extensions/common/manifest_constants.h7
2 files changed, 14 insertions, 1 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index c03e3f4..b8d9ae2 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -111,6 +111,8 @@ const char kRunAt[] = "run_at";
const char kSandboxedPages[] = "sandbox.pages";
const char kSandboxedPagesCSP[] = "sandbox.content_security_policy";
const char kScriptBadge[] = "script_badge";
+const char kSearchProvider[] = "chrome_settings_overrides.search_provider";
+const char kSettingsOverride[] = "chrome_settings_overrides";
const char kShiftKey[] = "shiftKey";
const char kShortcutKey[] = "shortcutKey";
const char kShortName[] = "short_name";
@@ -337,6 +339,8 @@ const char kInvalidGlob[] =
"Invalid value for 'content_scripts[*].*[*]'.";
const char kInvalidGlobList[] =
"Invalid value for 'content_scripts[*].*'.";
+const char kInvalidHomepageOverrideURL[] =
+ "Invalid value for overriding homepage url: '[*]'.";
const char kInvalidHomepageURL[] =
"Invalid value for homepage url: '[*]'.";
const char kInvalidIconPath[] =
@@ -528,6 +532,8 @@ const char kInvalidSandboxedPagesCSP[] =
"Invalid value for 'sandbox.content_security_policy'.";
const char kInvalidScriptBadge[] =
"Invalid value for 'script_badge'.";
+const char kInvalidEmptySettingsOverrides[] =
+ "Empty dictionary for 'chrome_settings_overrides'.";
const char kInvalidShortName[] =
"Invalid value for 'short_name'.";
const char kInvalidSignature[] =
@@ -542,6 +548,8 @@ const char kInvalidSpellcheckDictionaryLocale[] =
"Invalid value for spellcheck dictionary locale.";
const char kInvalidSpellcheckDictionaryPath[] =
"Invalid value for spellcheck dictionary path.";
+const char kInvalidStartupOverrideURL[] =
+ "Invalid value for overriding startup URL: '[*]'.";
const char kInvalidSystemIndicator[] =
"Invalid value for 'system_indicator'.";
const char kInvalidTheme[] =
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index bf78fa5..846845e 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -48,7 +48,6 @@ extern const char kFileHandlerTypes[];
extern const char kFileFilters[];
extern const char kFileBrowserHandlers[];
extern const char kGlobal[];
-extern const char kMediaGalleriesHandlers[];
extern const char kHomepageURL[];
extern const char kIcons[];
extern const char kId[];
@@ -79,6 +78,7 @@ extern const char kLaunchWidth[];
extern const char kLayouts[];
extern const char kManifestVersion[];
extern const char kMatches[];
+extern const char kMediaGalleriesHandlers[];
extern const char kMIMETypes[];
extern const char kMimeTypesHandler[];
extern const char kMinimumChromeVersion[];
@@ -120,6 +120,8 @@ extern const char kRunAt[];
extern const char kSandboxedPages[];
extern const char kSandboxedPagesCSP[];
extern const char kScriptBadge[];
+extern const char kSearchProvider[];
+extern const char kSettingsOverride[];
extern const char kShiftKey[];
extern const char kShortcutKey[];
extern const char kShortName[];
@@ -283,6 +285,7 @@ extern const char kInvalidFileHandlerType[];
extern const char kInvalidFileHandlerTypeElement[];
extern const char kInvalidGlob[];
extern const char kInvalidGlobList[];
+extern const char kInvalidHomepageOverrideURL[];
extern const char kInvalidHomepageURL[];
extern const char kInvalidIconPath[];
extern const char kInvalidIcons[];
@@ -374,6 +377,7 @@ extern const char kInvalidSandboxedPagesList[];
extern const char kInvalidSandboxedPage[];
extern const char kInvalidSandboxedPagesCSP[];
extern const char kInvalidScriptBadge[];
+extern const char kInvalidEmptySettingsOverrides[];
extern const char kInvalidShortName[];
extern const char kInvalidSignature[];
extern const char kInvalidSpellcheck[];
@@ -381,6 +385,7 @@ extern const char kInvalidSpellcheckDictionaryFormat[];
extern const char kInvalidSpellcheckDictionaryLanguage[];
extern const char kInvalidSpellcheckDictionaryLocale[];
extern const char kInvalidSpellcheckDictionaryPath[];
+extern const char kInvalidStartupOverrideURL[];
extern const char kInvalidSystemIndicator[];
extern const char kInvalidTheme[];
extern const char kInvalidThemeColors[];