Index: content/public/renderer/render_frame.h |
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h |
index 0ac29c8eecdab5aaa8ebc77b1f0e2422197520f6..83975c8a5bd4841b75c59cef3239f50f919f0df8 100644 |
--- a/content/public/renderer/render_frame.h |
+++ b/content/public/renderer/render_frame.h |
@@ -13,8 +13,12 @@ |
#include "base/strings/string16.h" |
#include "content/common/content_export.h" |
#include "content/public/common/console_message_level.h" |
+#include "content/public/renderer/render_thread.h" |
Sam McNally
2016/09/09 05:33:15
These extra includes aren't needed anymore.
Ken Rockot(use gerrit already)
2016/09/09 16:01:50
Removed
|
#include "ipc/ipc_listener.h" |
#include "ipc/ipc_sender.h" |
+#include "ipc/ipc_sync_channel.h" |
+#include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
+#include "mojo/public/cpp/bindings/associated_interface_request.h" |
#include "third_party/WebKit/public/platform/WebPageVisibilityState.h" |
#include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
@@ -50,6 +54,8 @@ class Isolate; |
} |
namespace content { |
+class AssociatedInterfaceProvider; |
+class AssociatedInterfaceRegistry; |
class ContextMenuClient; |
class PluginInstanceThrottler; |
class RenderAccessibility; |
@@ -155,6 +161,15 @@ class CONTENT_EXPORT RenderFrame : public IPC::Listener, |
// interfaces exposed to it by the application running in this frame. |
virtual shell::InterfaceProvider* GetRemoteInterfaces() = 0; |
+ // Returns the AssociatedInterfaceRegistry this frame can use to expose |
+ // frame-specific Channel-associated interfaces to the remote RenderFrameHost. |
+ virtual AssociatedInterfaceRegistry* GetAssociatedInterfaceRegistry() = 0; |
+ |
+ // Returns the AssociatedInterfaceProvider this frame can use to access |
+ // frame-specific Channel-assocaited interfaces from the remote |
+ // RenderFrameHost. |
+ virtual AssociatedInterfaceProvider* GetRemoteAssociatedInterfaces() = 0; |
+ |
#if defined(ENABLE_PLUGINS) |
// Registers a plugin that has been marked peripheral. If the origin |
// whitelist is later updated and includes |content_origin|, then |