summaryrefslogtreecommitdiffstats
path: root/content/browser/web_contents/web_contents_impl.h
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 03:30:12 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 03:30:12 +0000
commit82307f6b304d5049d360db170b256bd4afe5eec9 (patch)
tree01112e9779660819c126ac3f133949dff8d50365 /content/browser/web_contents/web_contents_impl.h
parent354de9e4ee84df3b177f6c57752a1a16daedb84e (diff)
downloadchromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.zip
chromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.tar.gz
chromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.tar.bz2
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 Review URL: https://codereview.chromium.org/444503002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287954 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.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index b944ea1..cd5b970 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -548,7 +548,10 @@ class CONTENT_EXPORT WebContentsImpl
RenderViewHost* render_view_host,
int opener_route_id,
int proxy_routing_id,
- bool for_main_frame) OVERRIDE;
+ bool for_main_frame_navigation) OVERRIDE;
+ virtual bool CreateRenderFrameForRenderManager(
+ RenderFrameHost* render_frame_host,
+ int parent_routing_id) OVERRIDE;
virtual void BeforeUnloadFiredFromRenderManager(
bool proceed, const base::TimeTicks& proceed_time,
bool* proceed_to_fire_unload) OVERRIDE;