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

Unified Diff: remoting/client/jingle_host_connection.h

Issue 2861047: Refactor the client code. Move all x11-related code into X11View and create... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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
Index: remoting/client/jingle_host_connection.h
===================================================================
--- remoting/client/jingle_host_connection.h (revision 52921)
+++ remoting/client/jingle_host_connection.h (working copy)
@@ -22,6 +22,7 @@
#include "base/scoped_ptr.h"
#include "base/task.h"
#include "remoting/base/protocol_decoder.h"
+#include "remoting/client/client_context.h"
#include "remoting/client/host_connection.h"
#include "remoting/jingle_glue/jingle_channel.h"
#include "remoting/jingle_glue/jingle_client.h"
@@ -30,18 +31,17 @@
namespace remoting {
+class ClientConfig;
class JingleThread;
class JingleHostConnection : public HostConnection,
public JingleChannel::Callback,
public JingleClient::Callback {
public:
- explicit JingleHostConnection(JingleThread* network_thread);
+ explicit JingleHostConnection(ClientContext* context);
virtual ~JingleHostConnection();
- virtual void Connect(const std::string& username,
- const std::string& auth_token,
- const std::string& host_jid,
+ virtual void Connect(ClientConfig* config,
HostEventCallback* event_callback);
virtual void Disconnect();
@@ -61,13 +61,11 @@
private:
MessageLoop* message_loop();
- void DoConnect(const std::string& username,
- const std::string& auth_token,
- const std::string& host_jid,
+ void DoConnect(ClientConfig* config,
HostEventCallback* event_callback);
void DoDisconnect();
- JingleThread* network_thread_;
+ ClientContext* context_;
scoped_refptr<JingleClient> jingle_client_;
scoped_refptr<JingleChannel> jingle_channel_;

Powered by Google App Engine
This is Rietveld 408576698