| Index: chrome/renderer/extensions/send_request_natives.cc
|
| ===================================================================
|
| --- chrome/renderer/extensions/send_request_natives.cc (revision 186747)
|
| +++ chrome/renderer/extensions/send_request_natives.cc (working copy)
|
| @@ -13,20 +13,14 @@
|
| namespace extensions {
|
|
|
| SendRequestNatives::SendRequestNatives(Dispatcher* dispatcher,
|
| - RequestSender* request_sender,
|
| - ChromeV8Context* context)
|
| - : ChromeV8Extension(dispatcher, context->v8_context()),
|
| - request_sender_(request_sender),
|
| - context_(context) {
|
| + RequestSender* request_sender)
|
| + : ChromeV8Extension(dispatcher), request_sender_(request_sender) {
|
| RouteFunction("GetNextRequestId",
|
| base::Bind(&SendRequestNatives::GetNextRequestId,
|
| base::Unretained(this)));
|
| RouteFunction("StartRequest",
|
| base::Bind(&SendRequestNatives::StartRequest,
|
| base::Unretained(this)));
|
| - RouteFunction("GetGlobal",
|
| - base::Bind(&SendRequestNatives::GetGlobal,
|
| - base::Unretained(this)));
|
| }
|
|
|
| v8::Handle<v8::Value> SendRequestNatives::GetNextRequestId(
|
| @@ -48,28 +42,22 @@
|
| scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
|
|
|
| // See http://crbug.com/149880. The context menus APIs relies on this, but
|
| - // we shouldn't really be doing it (e.g. for the sake of the storage API).
|
| + // we shouln't really be doing it (e.g. for the sake of the storage API).
|
| converter->SetFunctionAllowed(true);
|
|
|
| if (!preserve_null_in_objects)
|
| converter->SetStripNullFromObjects(true);
|
|
|
| - scoped_ptr<Value> value_args(converter->FromV8Value(args[1], v8_context()));
|
| + scoped_ptr<Value> value_args(
|
| + converter->FromV8Value(args[1], v8::Context::GetCurrent()));
|
| if (!value_args.get() || !value_args->IsType(Value::TYPE_LIST)) {
|
| NOTREACHED() << "Unable to convert args passed to StartRequest";
|
| return v8::Undefined();
|
| }
|
|
|
| - request_sender_->StartRequest(
|
| - context_, name, request_id, has_callback, for_io_thread,
|
| - static_cast<ListValue*>(value_args.get()));
|
| + request_sender_->StartRequest(name, request_id, has_callback, for_io_thread,
|
| + static_cast<ListValue*>(value_args.get()));
|
| return v8::Undefined();
|
| }
|
|
|
| -v8::Handle<v8::Value> SendRequestNatives::GetGlobal(const v8::Arguments& args) {
|
| - CHECK_EQ(1, args.Length());
|
| - CHECK(args[0]->IsObject());
|
| - return v8::Handle<v8::Object>::Cast(args[0])->CreationContext()->Global();
|
| -}
|
| -
|
| } // namespace extensions
|
|
|