diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 00:48:12 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 00:48:12 +0000 |
| commit | f2d6a00399cc2171b4180ca29be5e0dd3154454a (patch) | |
| tree | 5636a050a999827a7ce99622405768c156853757 /remoting/protocol/fake_session.h | |
| parent | 59886edef95ad60b74f70df276f1d21744ad48e2 (diff) | |
| download | chromium_src-f2d6a00399cc2171b4180ca29be5e0dd3154454a.zip chromium_src-f2d6a00399cc2171b4180ca29be5e0dd3154454a.tar.gz chromium_src-f2d6a00399cc2171b4180ca29be5e0dd3154454a.tar.bz2 | |
Add CancelChannelCreation() in protocol::Session interface.
The new method cancels channel creation for pending channel. This
prevents some potential crashes.
Review URL: http://codereview.chromium.org/8573013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/fake_session.h')
| -rw-r--r-- | remoting/protocol/fake_session.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h index de56176..c7be7e4 100644 --- a/remoting/protocol/fake_session.h +++ b/remoting/protocol/fake_session.h @@ -138,33 +138,36 @@ class FakeSession : public Session { FakeUdpSocket* GetDatagramChannel(const std::string& name); // Session interface. - virtual void SetStateChangeCallback(const StateChangeCallback& callback); + virtual void SetStateChangeCallback( + const StateChangeCallback& callback) OVERRIDE; - virtual Session::Error error(); + virtual Session::Error error() OVERRIDE; virtual void CreateStreamChannel( - const std::string& name, const StreamChannelCallback& callback); + const std::string& name, const StreamChannelCallback& callback) OVERRIDE; virtual void CreateDatagramChannel( - const std::string& name, const DatagramChannelCallback& callback); + const std::string& name, + const DatagramChannelCallback& callback) OVERRIDE; + virtual void CancelChannelCreation(const std::string& name) OVERRIDE; - virtual FakeSocket* control_channel(); - virtual FakeSocket* event_channel(); + virtual FakeSocket* control_channel() OVERRIDE; + virtual FakeSocket* event_channel() OVERRIDE; - virtual const std::string& jid(); + virtual const std::string& jid() OVERRIDE; - virtual const CandidateSessionConfig* candidate_config(); - virtual const SessionConfig& config(); - virtual void set_config(const SessionConfig& config); + virtual const CandidateSessionConfig* candidate_config() OVERRIDE; + virtual const SessionConfig& config() OVERRIDE; + virtual void set_config(const SessionConfig& config) OVERRIDE; - virtual const std::string& initiator_token(); - virtual void set_initiator_token(const std::string& initiator_token); - virtual const std::string& receiver_token(); - virtual void set_receiver_token(const std::string& receiver_token); + virtual const std::string& initiator_token() OVERRIDE; + virtual void set_initiator_token(const std::string& initiator_token) OVERRIDE; + virtual const std::string& receiver_token() OVERRIDE; + virtual void set_receiver_token(const std::string& receiver_token) OVERRIDE; - virtual void set_shared_secret(const std::string& secret); - virtual const std::string& shared_secret(); + virtual void set_shared_secret(const std::string& secret) OVERRIDE; + virtual const std::string& shared_secret() OVERRIDE; - virtual void Close(); + virtual void Close() OVERRIDE; public: StateChangeCallback callback_; |