| Index: remoting/host/plugin/host_script_object.cc
|
| diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
|
| index d25f89cdb5117907534863d57d482c9ac284b499..817e5a715852cb6d2fac9b3f7d75bd07ecc37dca 100644
|
| --- a/remoting/host/plugin/host_script_object.cc
|
| +++ b/remoting/host/plugin/host_script_object.cc
|
| @@ -114,7 +114,8 @@ bool HostNPScriptObject::Init() {
|
| DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread());
|
| VLOG(2) << "Init";
|
|
|
| - host_context_.reset(new ChromotingHostContext(plugin_message_loop_proxy_));
|
| + host_context_.reset(new ChromotingHostContext(NULL,
|
| + plugin_message_loop_proxy_));
|
| if (!host_context_->Start()) {
|
| host_context_.reset();
|
| return false;
|
| @@ -464,7 +465,7 @@ void HostNPScriptObject::FinishConnectMainThread(
|
| // TODO(sergeyu): Fix DesktopEnvironment so that it can be created
|
| // on either the UI or the network thread so that we can avoid
|
| // jumping to the main thread here.
|
| - desktop_environment_.reset(DesktopEnvironment::Create(host_context_.get()));
|
| + desktop_environment_ = DesktopEnvironment::Create(host_context_.get());
|
|
|
| FinishConnectNetworkThread(uid, auth_token, auth_service);
|
| }
|
|
|