diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/common/extensions/extension_constants.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/common/extensions/extension_constants.cc')
| -rw-r--r-- | chrome/common/extensions/extension_constants.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index f725181..983fda4 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -202,8 +202,7 @@ const char* kInvalidPermission = const char* kInvalidPermissions = "Required value 'permissions' is missing or invalid."; const char* kInvalidPermissionScheme = - "Invalid scheme for 'permissions[*]'. Only 'http' and 'https' are " - "allowed."; + "Invalid scheme for 'permissions[*]'."; const char* kInvalidPlugins = "Invalid value for 'plugins'."; const char* kInvalidPluginsPath = @@ -265,7 +264,7 @@ const char* kOmniboxExperimental = "You must request the 'experimental' permission in order to use the" " omnibox API."; const char* kOneUISurfaceOnly = - "An extension cannot have both a page action and a browser action."; + "Only one of 'browser_action', 'page_action', and 'app' can be specified."; const char* kReservedMessageFound = "Reserved key * found in message catalog."; const char* kThemesCannotContainExtensions = |