OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 LOG(INFO) << "Delaying connect until initial policy is read."; | 166 LOG(INFO) << "Delaying connect until initial policy is read."; |
167 delayed_connect_.reset( | 167 delayed_connect_.reset( |
168 task_factory_.NewRunnableMethod(&ChromotingInstance::Connect, | 168 task_factory_.NewRunnableMethod(&ChromotingInstance::Connect, |
169 config)); | 169 config)); |
170 return; | 170 return; |
171 } | 171 } |
172 | 172 |
173 webkit::ppapi::PluginInstance* plugin_instance = | 173 webkit::ppapi::PluginInstance* plugin_instance = |
174 webkit::ppapi::ResourceTracker::Get()->GetInstance(pp_instance()); | 174 webkit::ppapi::ResourceTracker::Get()->GetInstance(pp_instance()); |
175 | 175 |
176 P2PSocketDispatcher* socket_dispatcher = | 176 content::P2PSocketDispatcher* socket_dispatcher = |
177 plugin_instance->delegate()->GetP2PSocketDispatcher(); | 177 plugin_instance->delegate()->GetP2PSocketDispatcher(); |
178 | 178 |
179 IpcNetworkManager* network_manager = NULL; | 179 content::IpcNetworkManager* network_manager = NULL; |
180 IpcPacketSocketFactory* socket_factory = NULL; | 180 content::IpcPacketSocketFactory* socket_factory = NULL; |
181 HostResolverFactory* host_resolver_factory = NULL; | 181 HostResolverFactory* host_resolver_factory = NULL; |
182 PortAllocatorSessionFactory* session_factory = | 182 PortAllocatorSessionFactory* session_factory = |
183 CreatePepperPortAllocatorSessionFactory( | 183 CreatePepperPortAllocatorSessionFactory( |
184 this, plugin_message_loop_, context_.network_message_loop()); | 184 this, plugin_message_loop_, context_.network_message_loop()); |
185 | 185 |
186 // If we don't have socket dispatcher for IPC (e.g. P2P API is | 186 // If we don't have socket dispatcher for IPC (e.g. P2P API is |
187 // disabled), then JingleSessionManager will try to use physical sockets. | 187 // disabled), then JingleSessionManager will try to use physical sockets. |
188 if (socket_dispatcher) { | 188 if (socket_dispatcher) { |
189 VLOG(1) << "Creating IpcNetworkManager and IpcPacketSocketFactory."; | 189 VLOG(1) << "Creating IpcNetworkManager and IpcPacketSocketFactory."; |
190 network_manager = new IpcNetworkManager(socket_dispatcher); | 190 network_manager = new content::IpcNetworkManager(socket_dispatcher); |
191 socket_factory = new IpcPacketSocketFactory(socket_dispatcher); | 191 socket_factory = new content::IpcPacketSocketFactory(socket_dispatcher); |
192 host_resolver_factory = new IpcHostResolverFactory(socket_dispatcher); | 192 host_resolver_factory = new IpcHostResolverFactory(socket_dispatcher); |
193 } | 193 } |
194 | 194 |
195 host_connection_.reset(new protocol::ConnectionToHost( | 195 host_connection_.reset(new protocol::ConnectionToHost( |
196 context_.network_message_loop(), network_manager, socket_factory, | 196 context_.network_message_loop(), network_manager, socket_factory, |
197 host_resolver_factory, session_factory, enable_client_nat_traversal_)); | 197 host_resolver_factory, session_factory, enable_client_nat_traversal_)); |
198 input_handler_.reset(new PepperInputHandler(&context_, | 198 input_handler_.reset(new PepperInputHandler(&context_, |
199 host_connection_.get(), | 199 host_connection_.get(), |
200 view_proxy_)); | 200 view_proxy_)); |
201 | 201 |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } | 547 } |
548 | 548 |
549 initial_policy_received_ = true; | 549 initial_policy_received_ = true; |
550 enable_client_nat_traversal_ = traversal_policy; | 550 enable_client_nat_traversal_ = traversal_policy; |
551 | 551 |
552 if (delayed_connect_.get()) | 552 if (delayed_connect_.get()) |
553 plugin_message_loop_->PostTask(FROM_HERE, delayed_connect_.release()); | 553 plugin_message_loop_->PostTask(FROM_HERE, delayed_connect_.release()); |
554 } | 554 } |
555 | 555 |
556 } // namespace remoting | 556 } // namespace remoting |
OLD | NEW |