summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/client_message_dispatcher.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 05:07:40 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 05:07:40 +0000
commit9e2a3137641bc104980e13388b6088d3f4a9b52f (patch)
tree353e7915a047c43b466f2d4de514605a71691b45 /remoting/protocol/client_message_dispatcher.cc
parent7feba7ed4d88f95d041abd6bea7a2ba93d9a9f3a (diff)
downloadchromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.zip
chromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.tar.gz
chromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.tar.bz2
Switch remoting/protocol to new callbacks
There is still some code that uses old callbacks (particularly unittests) - I will convert them in a separate CL. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/8116021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/client_message_dispatcher.cc')
-rw-r--r--remoting/protocol/client_message_dispatcher.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/client_message_dispatcher.cc b/remoting/protocol/client_message_dispatcher.cc
index 68bf4617..3112306 100644
--- a/remoting/protocol/client_message_dispatcher.cc
+++ b/remoting/protocol/client_message_dispatcher.cc
@@ -33,12 +33,13 @@ void ClientMessageDispatcher::Initialize(
control_message_reader_->Init(
session->control_channel(),
- NewCallback(this, &ClientMessageDispatcher::OnControlMessageReceived));
+ base::Bind(&ClientMessageDispatcher::OnControlMessageReceived,
+ base::Unretained(this)));
return;
}
void ClientMessageDispatcher::OnControlMessageReceived(
- ControlMessage* message, Task* done_task) {
+ ControlMessage* message, const base::Closure& done_task) {
if (message->has_begin_session_response()) {
const BeginSessionResponse& response = message->begin_session_response();
if (response.has_login_status() &&
@@ -51,8 +52,7 @@ void ClientMessageDispatcher::OnControlMessageReceived(
LOG(WARNING) << "Invalid control message received.";
- done_task->Run();
- delete done_task;
+ done_task.Run();
}
} // namespace protocol