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

Unified Diff: content/renderer/render_frame_impl.h

Issue 2816393002: Implement Connector::ApplySpec() & use to enforce navigation:frame (Closed)
Patch Set: . Created 3 years, 8 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/public/test/mock_render_process_host.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index ec8f52a19d26f6bef3e4eb937ce32e9f86a287d1..7f49908125dc0523aa61e5d785cb68b4741f7183 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -52,6 +52,7 @@
#include "media/mojo/interfaces/remoting.mojom.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "ppapi/features/features.h"
#include "services/service_manager/public/cpp/service_info.h"
@@ -187,7 +188,8 @@ class CONTENT_EXPORT RenderFrameImpl
NON_EXPORTED_BASE(mojom::HostZoom),
NON_EXPORTED_BASE(mojom::FrameBindingsControl),
NON_EXPORTED_BASE(public blink::WebFrameClient),
- NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) {
+ NON_EXPORTED_BASE(public blink::WebFrameSerializerClient),
+ NON_EXPORTED_BASE(service_manager::mojom::InterfaceProvider) {
public:
// Creates a new RenderFrame as the main frame of |render_view|.
static RenderFrameImpl* CreateMainFrame(
@@ -1122,6 +1124,10 @@ class CONTENT_EXPORT RenderFrameImpl
void InitializeBlameContext(RenderFrameImpl* parent_frame);
+ // service_manager::mojom::InterfaceProvider:
+ void GetInterface(const std::string& interface_name,
+ mojo::ScopedMessagePipeHandle interface_pipe) override;
+
// Stores the WebLocalFrame we are associated with. This is null from the
// constructor until BindToWebFrame is called, and it is null after
// frameDetached is called until destruction (which is asynchronous in the
@@ -1426,6 +1432,9 @@ class CONTENT_EXPORT RenderFrameImpl
// is used and released in didStartProvisionalLoad().
std::unique_ptr<PendingNavigationInfo> pending_navigation_info_;
+ mojo::BindingSet<service_manager::mojom::InterfaceProvider>
+ interface_provider_bindings_;
+
base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698