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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2401333002: Add a blink InterfaceRegistry. (Closed)
Patch Set: Created 4 years, 2 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 | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 096178bc478602062e296a870d92c7a362397750..c9da2295b9b010cee21e1afb09f688e3ec87f573 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -114,6 +114,7 @@
#include "content/renderer/media/user_media_client_impl.h"
#include "content/renderer/media/web_media_element_source_utils.h"
#include "content/renderer/media/webmediaplayer_ms.h"
+#include "content/renderer/mojo/blink_interface_registry_impl.h"
#include "content/renderer/mojo/interface_provider_js_wrapper.h"
#include "content/renderer/mojo_bindings_controller.h"
#include "content/renderer/navigation_state_impl.h"
@@ -1118,6 +1119,8 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
remote_interfaces_->Bind(std::move(remote_interfaces));
blink_interface_provider_.reset(new BlinkInterfaceProviderImpl(
remote_interfaces_->GetWeakPtr()));
+ blink_interface_registry_.reset(
+ new BlinkInterfaceRegistryImpl(interface_registry_->GetWeakPtr()));
std::pair<RoutingIDFrameMap::iterator, bool> result =
g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
@@ -6353,6 +6356,10 @@ blink::InterfaceProvider* RenderFrameImpl::interfaceProvider() {
return blink_interface_provider_.get();
}
+blink::InterfaceRegistry* RenderFrameImpl::interfaceRegistry() {
+ return blink_interface_registry_.get();
+}
+
blink::WebPageVisibilityState RenderFrameImpl::visibilityState() const {
RenderFrameImpl* local_root =
RenderFrameImpl::FromWebFrame(frame_->localRoot());
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698