diff options
Diffstat (limited to 'chrome/common/extensions/extension_constants.h')
| -rw-r--r-- | chrome/common/extensions/extension_constants.h | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h index 453fb1c..e3f1a0c 100644 --- a/chrome/common/extensions/extension_constants.h +++ b/chrome/common/extensions/extension_constants.h @@ -8,11 +8,6 @@ // Keys used in JSON representation of extensions. namespace extension_manifest_keys { extern const wchar_t* kAllFrames; - extern const wchar_t* kApp; - extern const wchar_t* kAppExtent; - extern const wchar_t* kAppLaunchUrl; - extern const wchar_t* kAppLaunchType; - extern const wchar_t* kAppOrigin; extern const wchar_t* kBackground; extern const wchar_t* kBrowserAction; extern const wchar_t* kMinimumChromeVersion; @@ -26,6 +21,10 @@ namespace extension_manifest_keys { extern const wchar_t* kExcludeGlobs; extern const wchar_t* kIcons; extern const wchar_t* kIncludeGlobs; + extern const wchar_t* kLaunch; + extern const wchar_t* kLaunchContainer; + extern const wchar_t* kLaunchLocalPath; + extern const wchar_t* kLaunchWebURL; extern const wchar_t* kJs; extern const wchar_t* kMatches; extern const wchar_t* kName; @@ -59,6 +58,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* kWebContentEnabled; + extern const wchar_t* kWebLaunchUrl; + extern const wchar_t* kWebOrigin; + extern const wchar_t* kWebPaths; } // namespace extension_manifest_keys // Some values expected in manifests. @@ -68,22 +72,16 @@ namespace extension_manifest_values { extern const char* kRunAtDocumentIdle; extern const char* kPageActionTypeTab; extern const char* kPageActionTypePermanent; - extern const char* kLaunchTypePanel; - extern const char* kLaunchTypeTab; - extern const char* kLaunchTypeWindow; + extern const char* kLaunchContainerPanel; + extern const char* kLaunchContainerTab; + extern const char* kLaunchContainerWindow; } // namespace extension_manifest_values // Error messages returned from Extension::InitFromValue(). namespace extension_manifest_errors { - extern const char* kAppsDisabled; + extern const char* kAppsNotEnabled; extern const char* kChromeVersionTooLow; extern const char* kInvalidAllFrames; - extern const char* kInvalidApp; - extern const char* kInvalidAppExtent; - extern const char* kInvalidAppExtentPattern; - extern const char* kInvalidAppLaunchType; - extern const char* kInvalidAppLaunchUrl; - extern const char* kInvalidAppOrigin; extern const char* kInvalidBackground; extern const char* kInvalidBrowserAction; extern const char* kInvalidChromeURLOverrides; @@ -99,6 +97,9 @@ namespace extension_manifest_errors { extern const char* kInvalidJs; extern const char* kInvalidJsList; extern const char* kInvalidKey; + extern const char* kInvalidLaunchContainer; + extern const char* kInvalidLaunchLocalPath; + extern const char* kInvalidLaunchWebURL; extern const char* kInvalidManifest; extern const char* kInvalidMatchCount; extern const char* kInvalidMatch; @@ -108,7 +109,6 @@ namespace extension_manifest_errors { extern const char* kInvalidPlugins; extern const char* kInvalidPluginsPath; extern const char* kInvalidPluginsPublic; - extern const char* kInvalidRunAt; extern const char* kInvalidSignature; extern const char* kInvalidToolstrip; @@ -135,6 +135,10 @@ namespace extension_manifest_errors { extern const char* kInvalidThemeImages; extern const char* kInvalidThemeColors; extern const char* kInvalidThemeTints; + 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; @@ -142,6 +146,8 @@ namespace extension_manifest_errors { extern const char* kMissingFile; extern const char* kInvalidUpdateURL; extern const char* kInvalidDefaultLocale; + extern const char* kLaunchContainerWithoutURL; + extern const char* kLaunchPathAndURLAreExclusive; extern const char* kLocalesNoDefaultLocaleSpecified; extern const char* kLocalesNoDefaultMessages; extern const char* kLocalesNoValidLocaleNamesListed; @@ -151,6 +157,7 @@ namespace extension_manifest_errors { extern const char* kReservedMessageFound; extern const char* kCannotAccessPage; extern const char* kCannotScriptGallery; + extern const char* kWebContentMustBeEnabled; } // namespace extension_manifest_errors namespace extension_urls { |