summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 00:55:32 +0000
committerjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 00:55:32 +0000
commit953620b6b138131552b29163a6a3fa4b3593f083 (patch)
tree6837b6816b4401a665266a96786180c9a038e8a8 /chrome/renderer
parent107248107d7b38e9614e99972b3a99385005956e (diff)
downloadchromium_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/renderer')
-rw-r--r--chrome/renderer/extensions/app_bindings.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
index 48893eb..2b3faab 100644
--- a/chrome/renderer/extensions/app_bindings.cc
+++ b/chrome/renderer/extensions/app_bindings.cc
@@ -12,6 +12,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/renderer/extensions/chrome_v8_context.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
#include "chrome/renderer/extensions/extension_helper.h"
@@ -194,7 +195,7 @@ v8::Handle<v8::Value> AppBindingsHandler::GetDetailsForFrameImpl(
return v8::Null();
scoped_ptr<DictionaryValue> manifest_copy(
- extension->manifest_value()->DeepCopy());
+ extension->manifest()->value()->DeepCopy());
manifest_copy->SetString("id", extension->id());
scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
return converter->ToV8Value(manifest_copy.get(),