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

Unified Diff: content/browser/navigator_connect/navigator_connect_dispatcher_host.cc

Issue 785133006: Enable messaging over a navigator.connect initiated channel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigator-connect_serviceside
Patch Set: add empty line Created 6 years 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/navigator_connect/navigator_connect_dispatcher_host.cc
diff --git a/content/browser/navigator_connect/navigator_connect_dispatcher_host.cc b/content/browser/navigator_connect/navigator_connect_dispatcher_host.cc
index 7334b9178dd9eb25e82f44147cb2a1a4889a7dc1..3a4ae29562e0197788be10a119cf2716f8c79424 100644
--- a/content/browser/navigator_connect/navigator_connect_dispatcher_host.cc
+++ b/content/browser/navigator_connect/navigator_connect_dispatcher_host.cc
@@ -5,6 +5,7 @@
#include "content/browser/navigator_connect/navigator_connect_dispatcher_host.h"
#include "content/browser/message_port_service.h"
+#include "content/browser/navigator_connect/navigator_connect_context.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "content/common/navigator_connect_messages.h"
#include "content/common/navigator_connect_types.h"
@@ -12,9 +13,11 @@
namespace content {
NavigatorConnectDispatcherHost::NavigatorConnectDispatcherHost(
- const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context)
+ const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context,
+ const scoped_refptr<NavigatorConnectContext>& navigator_connect_context)
: BrowserMessageFilter(NavigatorConnectMsgStart),
- service_worker_context_(service_worker_context) {
+ service_worker_context_(service_worker_context),
+ navigator_connect_context_(navigator_connect_context) {
}
NavigatorConnectDispatcherHost::~NavigatorConnectDispatcherHost() {
@@ -86,11 +89,12 @@ void NavigatorConnectDispatcherHost::OnConnectResult(
// Close port since connection failed.
MessagePortService::GetInstance()->ClosePort(client.message_port_id);
Send(new NavigatorConnectMsg_ConnectResult(thread_id, request_id, false));
- } else {
- // TODO(mek): Update MessagePortService to make communication between client
- // and service possible.
- Send(new NavigatorConnectMsg_ConnectResult(thread_id, request_id, true));
+ return;
}
+
+ // Register connection and post back result.
+ navigator_connect_context_->RegisterConnection(client, registration);
+ Send(new NavigatorConnectMsg_ConnectResult(thread_id, request_id, true));
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698