| 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 d51b1a5363b894b3bff2507b43f89f15ac0acbf2..8777295c1fe981f78d715693694a5d086e182e2a 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -140,6 +140,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| AXTreeIDRegistry::AXTreeID GetAXTreeID() override;
|
| SiteInstanceImpl* GetSiteInstance() override;
|
| RenderProcessHost* GetProcess() override;
|
| + RenderWidgetHostView* GetView() override;
|
| RenderFrameHost* GetParent() override;
|
| int GetFrameTreeNodeId() override;
|
| const std::string& GetFrameName() override;
|
| @@ -152,24 +153,23 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| void ExecuteJavaScript(const base::string16& javascript) override;
|
| void ExecuteJavaScript(const base::string16& javascript,
|
| const JavaScriptResultCallback& callback) override;
|
| + void ExecuteJavaScriptInIsolatedWorld(
|
| + const base::string16& javascript,
|
| + const JavaScriptResultCallback& callback,
|
| + int world_id) override;
|
| void ExecuteJavaScriptForTests(const base::string16& javascript) override;
|
| void ExecuteJavaScriptForTests(
|
| const base::string16& javascript,
|
| const JavaScriptResultCallback& callback) override;
|
| void ExecuteJavaScriptWithUserGestureForTests(
|
| const base::string16& javascript) override;
|
| - void ExecuteJavaScriptInIsolatedWorld(
|
| - const base::string16& javascript,
|
| - const JavaScriptResultCallback& callback,
|
| - int world_id) override;
|
| void ActivateFindInPageResultForAccessibility(int request_id) override;
|
| + void InsertVisualStateCallback(const VisualStateCallback& callback) override;
|
| RenderViewHost* GetRenderViewHost() override;
|
| ServiceRegistry* GetServiceRegistry() override;
|
| blink::WebPageVisibilityState GetVisibilityState() override;
|
| - void InsertVisualStateCallback(
|
| - const VisualStateCallback& callback) override;
|
| bool IsRenderFrameLive() override;
|
| - RenderWidgetHostView* GetView() override;
|
| + int GetProxyCount() override;
|
| #if defined(OS_ANDROID)
|
| void ActivateNearestFindResult(int request_id, float x, float y) override;
|
| void RequestFindMatchRects(int current_version) override;
|
|
|