diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 08:31:43 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 08:31:43 +0000 |
| commit | 3b76103e0186e3ac2b67373b6f35f81a44d986c8 (patch) | |
| tree | c03154bfa6d381f1279d46282009fdd37ac6e4ef /chrome/common/extensions/extension_constants.h | |
| parent | 75709691d97122dbefd7d73ce0cfade557e498b5 (diff) | |
| download | chromium_src-3b76103e0186e3ac2b67373b6f35f81a44d986c8.zip chromium_src-3b76103e0186e3ac2b67373b6f35f81a44d986c8.tar.gz chromium_src-3b76103e0186e3ac2b67373b6f35f81a44d986c8.tar.bz2 | |
Revert r50834
TBR=tony@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_constants.h')
| -rw-r--r-- | chrome/common/extensions/extension_constants.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h index a2a972b..b7f9ec8 100644 --- a/chrome/common/extensions/extension_constants.h +++ b/chrome/common/extensions/extension_constants.h @@ -32,7 +32,6 @@ namespace extension_manifest_keys { extern const wchar_t* kJs; extern const wchar_t* kMatches; extern const wchar_t* kName; - extern const wchar_t* kOmniboxKeyword; extern const wchar_t* kPageActionId; extern const wchar_t* kPageAction; extern const wchar_t* kPageActions; @@ -63,8 +62,11 @@ namespace extension_manifest_keys { extern const wchar_t* kVersion; extern const wchar_t* kUpdateURL; extern const wchar_t* kOptionsPage; + extern const wchar_t* kWebContent; extern const wchar_t* kWebLaunchUrl; - extern const wchar_t* kWebURLs; + extern const wchar_t* kWebOrigin; + extern const wchar_t* kWebPaths; + extern const wchar_t* kOmniboxKeyword; } // namespace extension_manifest_keys // Some values expected in manifests. @@ -142,8 +144,10 @@ namespace extension_manifest_errors { extern const char* kInvalidThemeImages; extern const char* kInvalidThemeColors; extern const char* kInvalidThemeTints; - extern const char* kInvalidWebURLs; - extern const char* kInvalidWebURL; + extern const char* kInvalidWebContentEnabled; + extern const char* kInvalidWebOrigin; + extern const char* kInvalidWebPaths; + extern const char* kInvalidWebPath; extern const char* kOneUISurfaceOnly; extern const char* kThemesCannotContainExtensions; extern const char* kManifestParseError; |