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

Unified Diff: remoting/client/jingle_host_connection.h

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Resolve merge conflicts Created 10 years, 1 month 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 | « no previous file | remoting/client/jingle_host_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/jingle_host_connection.h
diff --git a/remoting/client/jingle_host_connection.h b/remoting/client/jingle_host_connection.h
index f45c27a7e510748dba8d19ec9ec3f14cfdb8efbd..16d0b14230768461c051a734677a8a910218ebc0 100644
--- a/remoting/client/jingle_host_connection.h
+++ b/remoting/client/jingle_host_connection.h
@@ -26,8 +26,8 @@
#include "remoting/client/host_connection.h"
#include "remoting/jingle_glue/jingle_client.h"
#include "remoting/protocol/message_reader.h"
-#include "remoting/protocol/chromotocol_connection.h"
-#include "remoting/protocol/chromotocol_server.h"
+#include "remoting/protocol/session.h"
+#include "remoting/protocol/session_manager.h"
#include "remoting/protocol/stream_writer.h"
#include "remoting/protocol/video_reader.h"
@@ -35,8 +35,9 @@ class MessageLoop;
namespace remoting {
-class JingleThread;
+namespace protocol {
class VideoStub;
+} // namespace protocol
struct ClientConfig;
@@ -56,13 +57,13 @@ class JingleHostConnection : public HostConnection,
// JingleClient::Callback interface.
virtual void OnStateChange(JingleClient* client, JingleClient::State state);
- // Callback for ChromotocolServer.
- void OnNewChromotocolConnection(
- ChromotocolConnection* connection,
- ChromotocolServer::IncomingConnectionResponse* response);
+ // Callback for chromotocol SessionManager.
+ void OnNewSession(
+ protocol::Session* connection,
+ protocol::SessionManager::IncomingSessionResponse* response);
- // Callback for ChromotocolConnection.
- void OnConnectionStateChange(ChromotocolConnection::State state);
+ // Callback for chromotocol Session.
+ void OnSessionStateChange(protocol::Session::State state);
private:
// The message loop for the jingle thread this object works on.
@@ -70,7 +71,7 @@ class JingleHostConnection : public HostConnection,
// Called on the jingle thread after we've successfully to XMPP server. Starts
// P2P connection to the host.
- void InitConnection();
+ void InitSession();
// Callback for |control_reader_|.
void OnControlMessage(ChromotingHostMessage* msg);
@@ -86,8 +87,8 @@ class JingleHostConnection : public HostConnection,
ClientContext* context_;
scoped_refptr<JingleClient> jingle_client_;
- scoped_refptr<ChromotocolServer> chromotocol_server_;
- scoped_refptr<ChromotocolConnection> connection_;
+ scoped_refptr<protocol::SessionManager> session_manager_;
+ scoped_refptr<protocol::Session> session_;
MessageReader control_reader_;
EventStreamWriter event_writer_;
« no previous file with comments | « no previous file | remoting/client/jingle_host_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698