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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 17101034: Add static Create method to LibjingleTransportFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 252390ab7f997413a65a0df8fde59a859ae06232..079fefb019c5becff9d575ed5f0a17fe652bdf5e 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -57,17 +57,17 @@
#include "remoting/host/log_to_server.h"
#include "remoting/host/logging.h"
#include "remoting/host/me2me_desktop_environment.h"
-#include "remoting/host/network_settings.h"
#include "remoting/host/policy_hack/policy_watcher.h"
#include "remoting/host/service_urls.h"
-#include "remoting/host/session_manager_factory.h"
#include "remoting/host/signaling_connector.h"
#include "remoting/host/token_validator_factory_impl.h"
#include "remoting/host/ui_strings.h"
#include "remoting/host/usage_stats_consent.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/protocol/me2me_host_authenticator_factory.h"
+#include "remoting/protocol/network_settings.h"
#include "remoting/protocol/pairing_registry.h"
+#include "remoting/protocol/session_manager_factory.h"
#if defined(OS_POSIX)
#include <signal.h>
@@ -930,19 +930,19 @@ void HostProcess::StartHost() {
signaling_connector_->EnableOAuth(oauth_credentials.Pass());
}
- NetworkSettings network_settings(
+ protocol::NetworkSettings network_settings(
allow_nat_traversal_ ?
- NetworkSettings::NAT_TRAVERSAL_ENABLED :
- NetworkSettings::NAT_TRAVERSAL_DISABLED);
+ protocol::NetworkSettings::NAT_TRAVERSAL_ENABLED :
+ protocol::NetworkSettings::NAT_TRAVERSAL_DISABLED);
if (!allow_nat_traversal_) {
- 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;
}
host_.reset(new ChromotingHost(
signal_strategy_.get(),
desktop_environment_factory_.get(),
- CreateHostSessionManager(network_settings,
+ protocol::CreateNativeSessionManager(network_settings,
context_->url_request_context_getter()),
context_->audio_task_runner(),
context_->input_task_runner(),

Powered by Google App Engine
This is Rietveld 408576698