Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/client/plugin/pepper_xmpp_proxy.h" | 5 #include "remoting/client/plugin/pepper_xmpp_proxy.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
| 10 | 10 |
| 11 namespace remoting { | 11 namespace remoting { |
| 12 | 12 |
| 13 PepperXmppProxy::PepperXmppProxy( | 13 PepperXmppProxy::PepperXmppProxy( |
| 14 const SendIqCallback& send_iq_callback, | 14 const SendIqCallback& send_iq_callback, |
| 15 base::MessageLoopProxy* plugin_message_loop, | 15 base::SingleThreadTaskRunner* plugin_task_runner, |
| 16 base::MessageLoopProxy* callback_message_loop) | 16 base::SingleThreadTaskRunner* callback_task_runner) |
| 17 : send_iq_callback_(send_iq_callback), | 17 : send_iq_callback_(send_iq_callback), |
| 18 plugin_message_loop_(plugin_message_loop), | 18 plugin_task_runner_(plugin_task_runner), |
| 19 callback_message_loop_(callback_message_loop) { | 19 callback_task_runner_(callback_task_runner) { |
| 20 DCHECK(plugin_message_loop_->BelongsToCurrentThread()); | 20 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); |
| 21 } | 21 } |
| 22 | 22 |
| 23 PepperXmppProxy::~PepperXmppProxy() { | 23 PepperXmppProxy::~PepperXmppProxy() { |
| 24 } | 24 } |
| 25 | 25 |
| 26 void PepperXmppProxy::AttachCallback(base::WeakPtr<ResponseCallback> callback) { | 26 void PepperXmppProxy::AttachCallback(base::WeakPtr<ResponseCallback> callback) { |
| 27 DCHECK(callback_message_loop_->BelongsToCurrentThread()); | 27 DCHECK(callback_task_runner_->BelongsToCurrentThread()); |
| 28 callback_ = callback; | 28 callback_ = callback; |
| 29 } | 29 } |
| 30 | 30 |
| 31 void PepperXmppProxy::DetachCallback() { | 31 void PepperXmppProxy::DetachCallback() { |
|
Wez
2012/06/11 22:32:44
nit: Are you missing a thread-check here?
Sergey Ulanov
2012/06/11 23:35:56
Done.
| |
| 32 callback_.reset(); | 32 callback_.reset(); |
| 33 } | 33 } |
| 34 | 34 |
| 35 void PepperXmppProxy::SendIq(const std::string& request_xml) { | 35 void PepperXmppProxy::SendIq(const std::string& request_xml) { |
| 36 if (!plugin_message_loop_->BelongsToCurrentThread()) { | 36 if (!plugin_task_runner_->BelongsToCurrentThread()) { |
| 37 plugin_message_loop_->PostTask(FROM_HERE, base::Bind( | 37 plugin_task_runner_->PostTask(FROM_HERE, base::Bind( |
| 38 &PepperXmppProxy::SendIq, this, request_xml)); | 38 &PepperXmppProxy::SendIq, this, request_xml)); |
| 39 return; | 39 return; |
| 40 } | 40 } |
| 41 | 41 |
| 42 send_iq_callback_.Run(request_xml); | 42 send_iq_callback_.Run(request_xml); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void PepperXmppProxy::OnIq(const std::string& response_xml) { | 45 void PepperXmppProxy::OnIq(const std::string& response_xml) { |
| 46 if (!callback_message_loop_->BelongsToCurrentThread()) { | 46 if (!callback_task_runner_->BelongsToCurrentThread()) { |
| 47 callback_message_loop_->PostTask( | 47 callback_task_runner_->PostTask( |
| 48 FROM_HERE, base::Bind(&PepperXmppProxy::OnIq, this, response_xml)); | 48 FROM_HERE, base::Bind(&PepperXmppProxy::OnIq, this, response_xml)); |
| 49 return; | 49 return; |
| 50 } | 50 } |
| 51 | 51 |
| 52 if (callback_) | 52 if (callback_) |
| 53 callback_->OnIq(response_xml); | 53 callback_->OnIq(response_xml); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace remoting | 56 } // namespace remoting |
| OLD | NEW |