| Index: content/browser/frame_host/render_frame_host_impl.h
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
|
| index 0dd9bffbdcaf380120c07101dd57a81eab745ff0..d3e62cb9418ef9c473e765b81da939efe0e05bf8 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -19,6 +19,7 @@
|
| #include "content/common/accessibility_mode_enums.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/mojo/service_registry_impl.h"
|
| +#include "content/common/render_frame_setup.mojom.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/common/javascript_message_type.h"
|
| #include "net/http/http_response_headers.h"
|
| @@ -438,6 +439,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| void OnHidePopup();
|
| #endif
|
|
|
| + // Registers Mojo services that this frame host makes available.
|
| + void RegisterMojoServices();
|
| +
|
| // Updates the state of this RenderFrameHost and clears any waiting state
|
| // that is no longer relevant.
|
| void SetState(RenderFrameHostImplState rfh_state);
|
| @@ -462,6 +466,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| void UpdateGuestFrameAccessibility(
|
| const std::map<int32, int> node_to_browser_plugin_instance_id_map);
|
|
|
| + // Informs the content client that geolocation permissions were used.
|
| + void DidUseGeolocationPermission();
|
| +
|
| // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
|
| // refcount that calls Shutdown when it reaches zero. This allows each
|
| // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
|
| @@ -568,6 +575,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| // response once it has started.
|
| scoped_ptr<StreamHandle> stream_handle_;
|
|
|
| + // Holds the browser-side handle to the pipe used to establish the Mojo
|
| + // connection between this instance and its associated render frame.
|
| + RenderFrameSetupPtr render_frame_setup_;
|
| +
|
| // NOTE: This must be the last member.
|
| base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
|
|
|
|
|