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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2119973002: Port WebSockets to Mojo IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused code Created 4 years, 5 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: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index fadeeca42041cb03120150ffe39978fa7c35804d..6f5103756fafd9581e74ff1381b66e915e60add1 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -51,6 +51,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/wake_lock/wake_lock_service_context.h"
+#include "content/browser/websockets/websocket_manager.h"
#include "content/browser/webui/web_ui_controller_factory_registry.h"
#include "content/common/accessibility_messages.h"
#include "content/common/frame_messages.h"
@@ -59,6 +60,7 @@
#include "content/common/navigation_params.h"
#include "content/common/site_isolation_policy.h"
#include "content/common/swapped_out_messages.h"
+#include "content/common/websocket.mojom.h"
#include "content/public/browser/ax_event_notification_details.h"
#include "content/public/browser/browser_accessibility_state.h"
#include "content/public/browser/browser_context.h"
@@ -2045,6 +2047,14 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
base::Bind(&device::VibrationManagerImpl::Create));
#endif
+ GetInterfaceRegistry()->AddInterface(
+ base::Bind(
+ &WebSocketManager::CreateWebSocket,
+ base::Unretained(static_cast<RenderProcessHostImpl*>(process_)->
+ GetWebSocketManager()),
+ routing_id_),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+
bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableWebBluetooth);
#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698