| Index: content/renderer/java/gin_java_bridge_value_converter.h
|
| diff --git a/content/renderer/java/gin_java_bridge_value_converter.h b/content/renderer/java/gin_java_bridge_value_converter.h
|
| index fd343b9fdd51e8c66ad4edf128bba574a89eeca4..9053bfa558bf7fcc4c32bfdcabbec2cb9b252700 100644
|
| --- a/content/renderer/java/gin_java_bridge_value_converter.h
|
| +++ b/content/renderer/java/gin_java_bridge_value_converter.h
|
| @@ -14,7 +14,7 @@ namespace content {
|
| class GinJavaBridgeValueConverter : public content::V8ValueConverter::Strategy {
|
| public:
|
| CONTENT_EXPORT GinJavaBridgeValueConverter();
|
| - CONTENT_EXPORT virtual ~GinJavaBridgeValueConverter();
|
| + CONTENT_EXPORT ~GinJavaBridgeValueConverter() override;
|
|
|
| CONTENT_EXPORT v8::Handle<v8::Value> ToV8Value(
|
| const base::Value* value,
|
| @@ -24,16 +24,16 @@ class GinJavaBridgeValueConverter : public content::V8ValueConverter::Strategy {
|
| v8::Handle<v8::Context> context) const;
|
|
|
| // content::V8ValueConverter::Strategy
|
| - virtual bool FromV8Object(v8::Handle<v8::Object> value,
|
| - base::Value** out,
|
| - v8::Isolate* isolate,
|
| - const FromV8ValueCallback& callback) const override;
|
| - virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value,
|
| - base::Value** out,
|
| - v8::Isolate* isolate) const override;
|
| - virtual bool FromV8Number(v8::Handle<v8::Number> value,
|
| - base::Value** out) const override;
|
| - virtual bool FromV8Undefined(base::Value** out) const override;
|
| + bool FromV8Object(v8::Handle<v8::Object> value,
|
| + base::Value** out,
|
| + v8::Isolate* isolate,
|
| + const FromV8ValueCallback& callback) const override;
|
| + bool FromV8ArrayBuffer(v8::Handle<v8::Object> value,
|
| + base::Value** out,
|
| + v8::Isolate* isolate) const override;
|
| + bool FromV8Number(v8::Handle<v8::Number> value,
|
| + base::Value** out) const override;
|
| + bool FromV8Undefined(base::Value** out) const override;
|
|
|
| private:
|
| scoped_ptr<V8ValueConverter> converter_;
|
|
|