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

Unified Diff: remoting/host/plugin/host_script_object.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/plugin/host_script_object.cc
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 8a5e133d7c2d7df2eec18c89a638c84e2776c94d..d3c2dfb3da3286bed53747b0eeb3fc3248abacff 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -26,15 +26,15 @@
#include "remoting/host/host_secret.h"
#include "remoting/host/host_status_observer.h"
#include "remoting/host/it2me_desktop_environment.h"
-#include "remoting/host/network_settings.h"
#include "remoting/host/pin_hash.h"
#include "remoting/host/plugin/host_log_handler.h"
#include "remoting/host/policy_hack/policy_watcher.h"
#include "remoting/host/register_support_host_request.h"
#include "remoting/host/service_urls.h"
-#include "remoting/host/session_manager_factory.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/protocol/it2me_host_authenticator_factory.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/protocol/session_manager_factory.h"
#include "third_party/npapi/bindings/npruntime.h"
namespace remoting {
@@ -361,20 +361,20 @@ void HostNPScriptObject::It2MeImpl::FinishConnect(
// If NAT traversal is off then limit port range to allow firewall pin-holing.
LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
- NetworkSettings network_settings(
+ protocol::NetworkSettings network_settings(
nat_traversal_enabled_ ?
- NetworkSettings::NAT_TRAVERSAL_ENABLED :
- NetworkSettings::NAT_TRAVERSAL_DISABLED);
+ protocol::NetworkSettings::NAT_TRAVERSAL_ENABLED :
+ 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.
host_.reset(new ChromotingHost(
signal_strategy_.get(),
desktop_environment_factory_.get(),
- CreateHostSessionManager(network_settings,
+ protocol::CreateNativeSessionManager(network_settings,
host_context_->url_request_context_getter()),
host_context_->audio_task_runner(),
host_context_->input_task_runner(),

Powered by Google App Engine
This is Rietveld 408576698