diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:28:05 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:28:05 +0000 |
| commit | 857aeb5d22d9b46950f5d4ac8020dab72ccf6a0c (patch) | |
| tree | 7c98a6c3b45cd8b9f31dfac06dec68535afb8ad2 /remoting | |
| parent | 366ae2448ddfcd11eb827205aa56c8c0c00442bb (diff) | |
| download | chromium_src-857aeb5d22d9b46950f5d4ac8020dab72ccf6a0c.zip chromium_src-857aeb5d22d9b46950f5d4ac8020dab72ccf6a0c.tar.gz chromium_src-857aeb5d22d9b46950f5d4ac8020dab72ccf6a0c.tar.bz2 | |
Remove cancel from RunnableFunctions.
BUG=NONE
TEST=BUILD
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84060
Review URL: http://codereview.chromium.org/6690031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 2 | ||||
| -rw-r--r-- | remoting/client/chromoting_client.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 3836776..72cf9f1 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -21,7 +21,7 @@ ChromotingClient::ChromotingClient(const ClientConfig& config, ChromotingView* view, RectangleUpdateDecoder* rectangle_decoder, InputHandler* input_handler, - CancelableTask* client_done) + Task* client_done) : config_(config), context_(context), connection_(connection), diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index fb785d7..ced3be7 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -45,7 +45,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback, ChromotingView* view, RectangleUpdateDecoder* rectangle_decoder, InputHandler* input_handler, - CancelableTask* client_done); + Task* client_done); virtual ~ChromotingClient(); void Start(); @@ -119,7 +119,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback, InputHandler* input_handler_; // If non-NULL, this is called when the client is done. - CancelableTask* client_done_; + Task* client_done_; ConnectionState state_; |