diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 22:46:47 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 22:46:47 +0000 |
| commit | 6d1c43b3e0324f6e870d9fc642f6135d990aee26 (patch) | |
| tree | f263ef45ec4cff6e6e88ae39d64459b26360f6e7 /chrome/common/extensions/extension_constants.cc | |
| parent | 73dca1b6e24c63f52cc2aaf44afdfb7c21df93a1 (diff) | |
| download | chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.zip chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.tar.gz chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.tar.bz2 | |
Revert "Restrict extension features based on the extension type."
This breaks some ChromeOS tests. Among the log output:
"Feature 'chrome_url_overrides' is not allowed in this type of manifest."
Original review: http://codereview.chromium.org/8654001
BUG=101992, 104103, chromium-os:23709
TEST=no
Review URL: http://codereview.chromium.org/8786004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_constants.cc')
| -rw-r--r-- | chrome/common/extensions/extension_constants.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index f818e62..2d0e730 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -166,8 +166,8 @@ const char kExpectString[] = "Expect string value."; const char kExperimentalFlagRequired[] = "Loading extensions with 'experimental' permission requires" " --enable-experimental-extension-apis command line flag."; -const char kFeatureNotAllowed[] = - "Feature '*' is not allowed in this type of manifest."; +const char kHostedAppsCannotIncludeExtensionFeatures[] = + "Hosted apps cannot use the extension feature '*'."; const char kInvalidAllFrames[] = "Invalid value for 'content_scripts[*].all_frames'."; const char kInvalidBackground[] = @@ -429,6 +429,8 @@ const char kReservedMessageFound[] = const char kSidebarExperimental[] = "You must request the 'experimental' permission in order to use the" " Sidebar API."; +const char kThemesCannotContainExtensions[] = + "A theme cannot contain extensions code."; #if defined(OS_CHROMEOS) const char kIllegalPlugins[] = "Extensions cannot install plugins on Chrome OS"; |