diff options
author | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 21:49:25 +0000 |
---|---|---|
committer | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 21:49:25 +0000 |
commit | ada2df7b3cb581b2bacef3effe7161a233e1e883 (patch) | |
tree | 6ccad55ce009cd720df36ec197b9fcfab9a46bf7 /content/browser/web_contents/web_contents_impl.h | |
parent | 23140050877c5a5bef19628c24f3eab732c4e4f1 (diff) | |
download | chromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.zip chromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.tar.gz chromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.tar.bz2 |
Revert of Start using RenderFrameProxyHost objects. (https://codereview.chromium.org/444503002/)
Reason for revert:
Appears to have destabilized RenderFrameHostManagerTest.AllowTargetedNavigationsAfterSwap
Original issue's description:
> Start using RenderFrameProxyHost objects.
>
> Instantiate RenderFrameProxyHost objects for remote frames when using
> --site-per-process.
>
> BUG=357747, 399709, 399775, 400594
> TBR=kenrb, creis, kalman
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287557
TBR=kenrb@chromium.org,creis@chromium.org,kalman@chromium.org,nick@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=357747, 399709, 399775, 400594
Review URL: https://codereview.chromium.org/438393004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/web_contents_impl.h')
-rw-r--r-- | content/browser/web_contents/web_contents_impl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 85770c1..aee4309 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -548,10 +548,7 @@ class CONTENT_EXPORT WebContentsImpl RenderViewHost* render_view_host, int opener_route_id, int proxy_routing_id, - bool for_main_frame_navigation) OVERRIDE; - virtual bool CreateRenderFrameForRenderManager( - RenderFrameHost* render_frame_host, - int parent_routing_id) OVERRIDE; + bool for_main_frame) OVERRIDE; virtual void BeforeUnloadFiredFromRenderManager( bool proceed, const base::TimeTicks& proceed_time, bool* proceed_to_fire_unload) OVERRIDE; |