Chromium Code Reviews| Index: remoting/host/it2me/it2me_native_messaging_host.cc |
| diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc |
| index 41e8f75ea95aa527f1a0d74c2ed1b56d8125e0ce..0c9102becf75510e6e00e897fb871f4ebcab1aba 100644 |
| --- a/remoting/host/it2me/it2me_native_messaging_host.cc |
| +++ b/remoting/host/it2me/it2me_native_messaging_host.cc |
| @@ -296,11 +296,14 @@ void It2MeNativeMessagingHost::ProcessConnect( |
| return; |
| } |
| - delegating_signal_strategy_ = new DelegatingSignalStrategy( |
| - local_jid, host_context_->network_task_runner(), |
| - base::Bind(&It2MeNativeMessagingHost::SendOutgoingIq, |
| - weak_factory_.GetWeakPtr())); |
| - signal_strategy.reset(delegating_signal_strategy_); |
| + DelegatingSignalStrategy* delegating_signal_strategy = |
|
Sergey Ulanov
2017/03/14 19:20:58
Use unique_ptr<> please:
auto delegating_signal
kelvinp
2017/03/15 21:56:46
Done.
|
| + new DelegatingSignalStrategy( |
| + local_jid, host_context_->network_task_runner(), |
| + base::Bind(&It2MeNativeMessagingHost::SendOutgoingIq, |
| + weak_factory_.GetWeakPtr())); |
| + incoming_message_callback_ = |
| + delegating_signal_strategy->MakeIncomingMessageCallback(); |
| + signal_strategy.reset(delegating_signal_strategy); |
|
Sergey Ulanov
2017/03/14 19:20:58
signal_strategy = std::move(delegating_signal_stra
kelvinp
2017/03/15 21:56:46
Done.
|
| } |
| std::string directory_bot_jid = service_urls->directory_bot_jid(); |
| @@ -357,8 +360,7 @@ void It2MeNativeMessagingHost::ProcessIncomingIq( |
| return; |
| } |
| - if (delegating_signal_strategy_) |
| - delegating_signal_strategy_->OnIncomingMessage(iq); |
| + incoming_message_callback_.Run(iq); |
| SendMessageToClient(std::move(response)); |
| }; |