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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 7715020: Move P2P code to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 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
« no previous file with comments | « remoting/client/ipc_host_resolver.cc ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 878289ccfbd14866513a3aa4c44179b3ed8e6b84..1003fc7468fd1e8ab28d1a02d41a23a8220b7753 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -173,11 +173,11 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
webkit::ppapi::PluginInstance* plugin_instance =
webkit::ppapi::ResourceTracker::Get()->GetInstance(pp_instance());
- P2PSocketDispatcher* socket_dispatcher =
+ content::P2PSocketDispatcher* socket_dispatcher =
plugin_instance->delegate()->GetP2PSocketDispatcher();
- IpcNetworkManager* network_manager = NULL;
- IpcPacketSocketFactory* socket_factory = NULL;
+ content::IpcNetworkManager* network_manager = NULL;
+ content::IpcPacketSocketFactory* socket_factory = NULL;
HostResolverFactory* host_resolver_factory = NULL;
PortAllocatorSessionFactory* session_factory =
CreatePepperPortAllocatorSessionFactory(
@@ -187,8 +187,8 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
// disabled), then JingleSessionManager will try to use physical sockets.
if (socket_dispatcher) {
VLOG(1) << "Creating IpcNetworkManager and IpcPacketSocketFactory.";
- network_manager = new IpcNetworkManager(socket_dispatcher);
- socket_factory = new IpcPacketSocketFactory(socket_dispatcher);
+ network_manager = new content::IpcNetworkManager(socket_dispatcher);
+ socket_factory = new content::IpcPacketSocketFactory(socket_dispatcher);
host_resolver_factory = new IpcHostResolverFactory(socket_dispatcher);
}
« no previous file with comments | « remoting/client/ipc_host_resolver.cc ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698