diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 00:55:32 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 00:55:32 +0000 |
| commit | 953620b6b138131552b29163a6a3fa4b3593f083 (patch) | |
| tree | 6837b6816b4401a665266a96786180c9a038e8a8 /chrome/common/extensions/extension_constants.cc | |
| parent | 107248107d7b38e9614e99972b3a99385005956e (diff) | |
| download | chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.zip chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.tar.gz chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.tar.bz2 | |
Reland restrict extension features based on the extension type.
The "chrome_url_overrides" manifest key is now accessible by packaged apps.
BUG=101992, 104103
TEST=existing, ManifestTest
Review URL: http://codereview.chromium.org/8654001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112914 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, 2 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index 2d0e730..f818e62 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 kHostedAppsCannotIncludeExtensionFeatures[] = - "Hosted apps cannot use the extension feature '*'."; +const char kFeatureNotAllowed[] = + "Feature '*' is not allowed in this type of manifest."; const char kInvalidAllFrames[] = "Invalid value for 'content_scripts[*].all_frames'."; const char kInvalidBackground[] = @@ -429,8 +429,6 @@ 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"; |