| 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 09ad7442185db25fdb48b9e10c49241da582a257..4b83d444b6878b2839ed05631d9d59b09edff809 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -38,9 +38,9 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
|
| virtual ~RenderFrameHostImpl();
|
|
|
| // RenderFrameHost
|
| + virtual int GetRoutingID() OVERRIDE;
|
| virtual SiteInstance* GetSiteInstance() OVERRIDE;
|
| virtual RenderProcessHost* GetProcess() OVERRIDE;
|
| - virtual int GetRoutingID() OVERRIDE;
|
| virtual RenderFrameHost* GetParent() OVERRIDE;
|
| virtual bool IsCrossProcessSubframe() OVERRIDE;
|
| virtual GURL GetLastCommittedURL() OVERRIDE;
|
| @@ -78,6 +78,11 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
|
| cross_process_frame_connector_ = cross_process_frame_connector;
|
| }
|
|
|
| + // Returns a bitwise OR of bindings types that have been enabled for this
|
| + // RenderFrameHostImpl's RenderView. See BindingsPolicy for details.
|
| + // TODO(creis): Make bindings frame-specific, to support cases like <webview>.
|
| + int GetEnabledBindings();
|
| +
|
| // Hack to get this subframe to swap out, without yet moving over all the
|
| // SwapOut state and machinery from RenderViewHost.
|
| void SwapOut();
|
|
|