Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(710)

Unified Diff: remoting/protocol/connection_to_client.h

Issue 6266023: Revert "Fix crashes in ChromotingHost" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/protocol/mock_objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_client.h
diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h
index b7aa052c9a298282f093bb4eb8a9b48e39bcf9b7..749ef5c1853ee84f4233185ac3f6bc12c802300e 100644
--- a/remoting/protocol/connection_to_client.h
+++ b/remoting/protocol/connection_to_client.h
@@ -55,10 +55,10 @@ class ConnectionToClient :
virtual ~ConnectionToClient();
- virtual void Init(Session* session);
+ virtual void Init(protocol::Session* session);
// Returns the connection in use.
- virtual Session* session();
+ virtual protocol::Session* session();
// Disconnect the client connection. This method is allowed to be called
// more than once and calls after the first one will be ignored.
@@ -78,15 +78,15 @@ class ConnectionToClient :
private:
// Callback for protocol Session.
- void OnSessionStateChange(Session::State state);
+ void OnSessionStateChange(protocol::Session::State state);
// Process a libjingle state change event on the |loop_|.
- void StateChangeTask(Session::State state);
+ void StateChangeTask(protocol::Session::State state);
void OnClosed();
// The libjingle channel used to send and receive data from the remote client.
- scoped_refptr<Session> session_;
+ scoped_refptr<protocol::Session> session_;
scoped_ptr<VideoWriter> video_writer_;
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/protocol/mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698