diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 06:10:20 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 06:10:20 +0000 |
| commit | fd0ca11848ed29a280ad45b967ad20397a613987 (patch) | |
| tree | aa0e6980bb44858d02010cf34571412a54943395 /remoting/host/it2me | |
| parent | 3bccb2aea8bd0d95055f1b4122ed5977e7fc9b6c (diff) | |
| download | chromium_src-fd0ca11848ed29a280ad45b967ad20397a613987.zip chromium_src-fd0ca11848ed29a280ad45b967ad20397a613987.tar.gz chromium_src-fd0ca11848ed29a280ad45b967ad20397a613987.tar.bz2 | |
Remove remoting/jingle_glue
Moved all files from remoting/jingle_glue to remoting/signaling and
remoting/protocol.
The new remoting/signaling directory contains signaling layer implementation
for remoting that can be used independently of remoting/protocol.
TBR=rch@chromium.org
Review URL: https://codereview.chromium.org/390983003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/it2me')
| -rw-r--r-- | remoting/host/it2me/it2me_host.cc | 14 | ||||
| -rw-r--r-- | remoting/host/it2me/it2me_host.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc index d715819..b9a17f8 100644 --- a/remoting/host/it2me/it2me_host.cc +++ b/remoting/host/it2me/it2me_host.cc @@ -21,9 +21,9 @@ #include "remoting/host/policy_hack/policy_watcher.h" #include "remoting/host/register_support_host_request.h" #include "remoting/host/session_manager_factory.h" -#include "remoting/jingle_glue/network_settings.h" -#include "remoting/jingle_glue/server_log_entry.h" #include "remoting/protocol/it2me_host_authenticator_factory.h" +#include "remoting/protocol/network_settings.h" +#include "remoting/signaling/server_log_entry.h" namespace remoting { @@ -184,13 +184,13 @@ void It2MeHost::FinishConnect() { // If NAT traversal is off then limit port range to allow firewall pin-holing. HOST_LOG << "NAT state: " << nat_traversal_enabled_; - NetworkSettings network_settings( + protocol::NetworkSettings network_settings( nat_traversal_enabled_ ? - NetworkSettings::NAT_TRAVERSAL_FULL : - NetworkSettings::NAT_TRAVERSAL_DISABLED); + protocol::NetworkSettings::NAT_TRAVERSAL_FULL : + protocol::NetworkSettings::NAT_TRAVERSAL_DISABLED); if (!nat_traversal_enabled_) { - network_settings.min_port = NetworkSettings::kDefaultMinPort; - network_settings.max_port = NetworkSettings::kDefaultMaxPort; + network_settings.min_port = protocol::NetworkSettings::kDefaultMinPort; + network_settings.max_port = protocol::NetworkSettings::kDefaultMaxPort; } // Create the host. diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h index 2c51eba..c970aad 100644 --- a/remoting/host/it2me/it2me_host.h +++ b/remoting/host/it2me/it2me_host.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "remoting/host/host_status_observer.h" -#include "remoting/jingle_glue/xmpp_signal_strategy.h" +#include "remoting/signaling/xmpp_signal_strategy.h" namespace base { class DictionaryValue; |