Chromium Code Reviews| Index: content/renderer/web_ui_mojo_context_state.cc |
| diff --git a/content/renderer/web_ui_mojo_context_state.cc b/content/renderer/web_ui_mojo_context_state.cc |
| index f1ff5f4896a058ee2ec87a868a4467211387fcf6..164104d26a34e9bad1228064bd4c67d265edd860 100644 |
| --- a/content/renderer/web_ui_mojo_context_state.cc |
| +++ b/content/renderer/web_ui_mojo_context_state.cc |
| @@ -36,14 +36,11 @@ namespace { |
| const char kModulePrefix[] = "chrome://mojo/"; |
| void RunMain(base::WeakPtr<gin::Runner> runner, |
| - mojo::ScopedMessagePipeHandle* handle, |
| v8::Handle<v8::Value> module) { |
| v8::Isolate* isolate = runner->GetContextHolder()->isolate(); |
| v8::Handle<v8::Function> start; |
| CHECK(gin::ConvertFromV8(isolate, module, &start)); |
| - v8::Handle<v8::Value> args[] = { |
| - gin::ConvertToV8(isolate, mojo::Handle(handle->release().value())) }; |
| - runner->Call(start, runner->global(), 1, args); |
| + runner->Call(start, runner->global(), 0, NULL); |
| } |
| } // namespace |
| @@ -71,14 +68,12 @@ WebUIMojoContextState::~WebUIMojoContextState() { |
| runner_->GetContextHolder()->context())->RemoveObserver(this); |
| } |
| -void WebUIMojoContextState::SetHandle(mojo::ScopedMessagePipeHandle handle) { |
| +void WebUIMojoContextState::Run() { |
| gin::ContextHolder* context_holder = runner_->GetContextHolder(); |
| - mojo::ScopedMessagePipeHandle* passed_handle = |
| - new mojo::ScopedMessagePipeHandle(handle.Pass()); |
| - gin::ModuleRegistry::From(context_holder->context())->LoadModule( |
| - context_holder->isolate(), |
| - "main", |
| - base::Bind(RunMain, runner_->GetWeakPtr(), base::Owned(passed_handle))); |
| + gin::ModuleRegistry::From(context_holder->context()) |
| + ->LoadModule(context_holder->isolate(), |
|
darin (slow to review)
2014/06/21 04:44:16
ditto
Sam McNally
2014/06/24 08:45:01
Done.
|
| + "main", |
| + base::Bind(RunMain, runner_->GetWeakPtr())); |
| } |
| void WebUIMojoContextState::FetchModules(const std::vector<std::string>& ids) { |