summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 17:01:19 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 17:01:19 +0000
commit8d86f13d2e87cc58739121d40dd698122707878e (patch)
treee405675f7074a991812eeda37e48e4b265c0cb12 /chrome/renderer/extensions
parent2b960d33bdcd6e390c0a9558b3793073f5659135 (diff)
downloadchromium_src-8d86f13d2e87cc58739121d40dd698122707878e.zip
chromium_src-8d86f13d2e87cc58739121d40dd698122707878e.tar.gz
chromium_src-8d86f13d2e87cc58739121d40dd698122707878e.tar.bz2
Make V8ValueConverter be an interface and move it to content\public\renderer and put in the content namespace.
BUG=98716 Review URL: http://codereview.chromium.org/8122011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
-rw-r--r--chrome/renderer/extensions/chrome_app_bindings.cc7
-rw-r--r--chrome/renderer/extensions/event_bindings.cc1
-rw-r--r--chrome/renderer/extensions/extension_bindings_context_set.cc8
3 files changed, 9 insertions, 7 deletions
diff --git a/chrome/renderer/extensions/chrome_app_bindings.cc b/chrome/renderer/extensions/chrome_app_bindings.cc
index f2b8638..c13e497 100644
--- a/chrome/renderer/extensions/chrome_app_bindings.cc
+++ b/chrome/renderer/extensions/chrome_app_bindings.cc
@@ -14,13 +14,14 @@
#include "chrome/common/extensions/extension_set.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
#include "chrome/renderer/extensions/extension_helper.h"
+#include "content/public/renderer/v8_value_converter.h"
#include "content/renderer/render_view.h"
-#include "content/renderer/v8_value_converter.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "v8/include/v8.h"
using WebKit::WebFrame;
+using content::V8ValueConverter;
namespace {
@@ -174,8 +175,8 @@ class ChromeAppExtensionWrapper : public v8::Extension {
scoped_ptr<DictionaryValue> manifest_copy(
extension->manifest_value()->DeepCopy());
manifest_copy->SetString("id", extension->id());
- V8ValueConverter converter;
- return converter.ToV8Value(manifest_copy.get(),
+ scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
+ return converter->ToV8Value(manifest_copy.get(),
frame->mainWorldScriptContext());
}
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index 5b2713d..c3b47cf3 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -21,7 +21,6 @@
#include "chrome/renderer/extensions/user_script_slave.h"
#include "content/renderer/render_thread.h"
#include "content/renderer/render_view.h"
-#include "content/renderer/v8_value_converter.h"
#include "googleurl/src/gurl.h"
#include "grit/renderer_resources.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
diff --git a/chrome/renderer/extensions/extension_bindings_context_set.cc b/chrome/renderer/extensions/extension_bindings_context_set.cc
index 8977c05..48f4a04 100644
--- a/chrome/renderer/extensions/extension_bindings_context_set.cc
+++ b/chrome/renderer/extensions/extension_bindings_context_set.cc
@@ -9,9 +9,9 @@
#include "base/tracked_objects.h"
#include "chrome/renderer/extensions/extension_bindings_context.h"
#include "content/common/url_constants.h"
+#include "content/public/renderer/v8_value_converter.h"
#include "content/renderer/render_thread.h"
#include "content/renderer/render_view.h"
-#include "content/renderer/v8_value_converter.h"
#include "v8/include/v8.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ -19,6 +19,8 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+using content::V8ValueConverter;
+
namespace {
// Returns true if the extension running in the given |render_view| has
@@ -124,7 +126,7 @@ void ExtensionBindingsContextSet::DispatchChromeHiddenMethod(
// out from under us.
ContextSet contexts = GetAll();
- V8ValueConverter converter;
+ scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
for (ContextSet::iterator it = contexts.begin(); it != contexts.end();
++it) {
if ((*it)->v8_context().IsEmpty())
@@ -148,7 +150,7 @@ void ExtensionBindingsContextSet::DispatchChromeHiddenMethod(
for (size_t i = 0; i < arguments.GetSize(); ++i) {
base::Value* item = NULL;
CHECK(arguments.Get(i, &item));
- v8_arguments.push_back(converter.ToV8Value(item, context));
+ v8_arguments.push_back(converter->ToV8Value(item, context));
}
v8::Handle<v8::Value> retval = (*it)->CallChromeHiddenMethod(