diff options
| author | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 20:45:44 +0000 |
|---|---|---|
| committer | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 20:45:44 +0000 |
| commit | 42c83708c84fbf7041387f7417d50536823732d4 (patch) | |
| tree | c722f082a2fe9ae0652d8bb15766e95ce746a1e9 /remoting/host/chromoting_host.h | |
| parent | 962e784873909cb03d070204d90954ebdf465904 (diff) | |
| download | chromium_src-42c83708c84fbf7041387f7417d50536823732d4.zip chromium_src-42c83708c84fbf7041387f7417d50536823732d4.tar.gz chromium_src-42c83708c84fbf7041387f7417d50536823732d4.tar.bz2 | |
[Chromoting] Make ChromotingHost's dependency on libjingle injected, instead of hard-coded.
This will help improve ChromotingHost's unit tests.
BUG=86546
Review URL: https://chromiumcodereview.appspot.com/10538091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host.h')
| -rw-r--r-- | remoting/host/chromoting_host.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h index 44eaed3..baf030e 100644 --- a/remoting/host/chromoting_host.h +++ b/remoting/host/chromoting_host.h @@ -19,10 +19,7 @@ #include "remoting/host/host_key_pair.h" #include "remoting/host/host_status_observer.h" #include "remoting/host/mouse_move_observer.h" -#include "remoting/host/network_settings.h" #include "remoting/host/ui_strings.h" -#include "remoting/jingle_glue/jingle_thread.h" -#include "remoting/jingle_glue/signal_strategy.h" #include "remoting/protocol/authenticator.h" #include "remoting/protocol/session_manager.h" #include "remoting/protocol/connection_to_client.h" @@ -74,7 +71,7 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, ChromotingHost(ChromotingHostContext* context, SignalStrategy* signal_strategy, DesktopEnvironment* environment, - const NetworkSettings& network_settings); + scoped_ptr<protocol::SessionManager> session_manager); // Asynchronously start the host process. // @@ -184,11 +181,10 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, // Parameters specified when the host was created. ChromotingHostContext* context_; DesktopEnvironment* desktop_environment_; - NetworkSettings network_settings_; + scoped_ptr<protocol::SessionManager> session_manager_; // Connection objects. SignalStrategy* signal_strategy_; - scoped_ptr<protocol::SessionManager> session_manager_; // Must be used on the network thread only. ObserverList<HostStatusObserver> status_observers_; |