| Index: mojo/apps/js/js_app.cc
|
| diff --git a/mojo/apps/js/js_app.cc b/mojo/apps/js/js_app.cc
|
| index f3550fa2530719b32958793e8e361bce7ce86260..f8eed3ec0c362680dcd3f8510acdf908332ab53e 100644
|
| --- a/mojo/apps/js/js_app.cc
|
| +++ b/mojo/apps/js/js_app.cc
|
| @@ -48,22 +48,21 @@ void JSApp::Quit() {
|
| FROM_HERE, base::Bind(&JSApp::Terminate, base::Unretained(this)));
|
| }
|
|
|
| -Handle JSApp::ConnectToService(const std::string& application_url,
|
| - const std::string& interface_name) {
|
| +Handle JSApp::ConnectToApplication(const std::string& application_url) {
|
| CHECK(on_js_app_thread());
|
| MessagePipe pipe;
|
|
|
| app_delegate_impl_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&ApplicationDelegateImpl::ConnectToService,
|
| + base::Bind(&ApplicationDelegateImpl::ConnectToApplication,
|
| base::Unretained(app_delegate_impl_),
|
| - base::Passed(pipe.handle1.Pass()),
|
| application_url,
|
| - interface_name));
|
| + base::Passed(pipe.handle1.Pass())));
|
|
|
| return pipe.handle0.release();
|
| }
|
|
|
| +
|
| void JSApp::Run() {
|
| CHECK(!js_app_task_runner_.get() && !on_app_delegate_impl_thread());
|
| js_app_task_runner_ = base::MessageLoop::current()->task_runner();
|
|
|