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

Unified Diff: mandoline/tab/frame_connection.cc

Issue 1290323002: HTMLViewer no longer connects to NetworkService interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 | « components/html_viewer/web_socket_handle_impl.cc ('k') | mojo/mojo_services.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/tab/frame_connection.cc
diff --git a/mandoline/tab/frame_connection.cc b/mandoline/tab/frame_connection.cc
index f2f3cac356170f2f375c2e2a1081dad312232cd2..90dfd18d35887b0c004b6104c37ef37f902f19cc 100644
--- a/mandoline/tab/frame_connection.cc
+++ b/mandoline/tab/frame_connection.cc
@@ -13,8 +13,9 @@
#include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
+#include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
#if defined(OS_LINUX) && !defined(OS_ANDROID)
#include "components/font_service/public/interfaces/font_service.mojom.h"
@@ -41,8 +42,9 @@ void FrameConnection::Init(mojo::ApplicationImpl* app,
resource_provider_interfaces.Pass());
mojo::Array<mojo::String> network_service_interfaces;
- network_service_interfaces.push_back(mojo::NetworkService::Name_);
+ network_service_interfaces.push_back(mojo::CookieStore::Name_);
network_service_interfaces.push_back(mojo::URLLoaderFactory::Name_);
+ network_service_interfaces.push_back(mojo::WebSocketFactory::Name_);
filter->filter.insert("mojo:network_service",
network_service_interfaces.Pass());
« no previous file with comments | « components/html_viewer/web_socket_handle_impl.cc ('k') | mojo/mojo_services.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698