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_messages.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_messages.cc')
| -rw-r--r-- | chrome/common/extensions/extension_messages.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc index 3adee27..a326289 100644 --- a/chrome/common/extensions/extension_messages.cc +++ b/chrome/common/extensions/extension_messages.cc @@ -5,7 +5,6 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/manifest.h" #include "content/public/common/common_param_traits.h" ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params() @@ -50,11 +49,10 @@ ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params( extension_manifest_keys::kVersion, }; - // Copy only the data we need and bypass the manifest type checks. - DictionaryValue* source = extension->manifest()->value(); + // Copy only the data we need. for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRendererExtensionKeys); ++i) { Value* temp = NULL; - if (source->Get(kRendererExtensionKeys[i], &temp)) + if (extension->manifest_value()->Get(kRendererExtensionKeys[i], &temp)) manifest->Set(kRendererExtensionKeys[i], temp->DeepCopy()); } } |