Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2260)

Unified Diff: content/renderer/render_frame_impl.h

Issue 18178006: Implement WebFrameClient in RenderFrame and proxy all calls to RenderView (for now). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to resolve conflict. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 49130da3183ea9686c529cede5ce0abcafe7dc8a..2a18c142b2750824af2c2bafa9098652426d0e57 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -19,7 +19,15 @@ class CONTENT_EXPORT RenderFrameImpl
: public RenderFrame,
NON_EXPORTED_BASE(public WebKit::WebFrameClient) {
public:
- RenderFrameImpl(RenderViewImpl* render_view, int routing_id);
+ // Creates a new RenderFrame. |render_view| is the RenderView object that this
+ // frame belongs to.
+ static RenderFrameImpl* Create(RenderViewImpl* render_view, int32 routing_id);
+
+ // Used by content_layouttest_support to hook into the creation of
+ // RenderFrameImpls.
+ static void InstallCreateHook(
+ RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32));
+
virtual ~RenderFrameImpl();
// IPC::Sender
@@ -61,15 +69,6 @@ class CONTENT_EXPORT RenderFrameImpl
const WebKit::WebURLRequest& request,
WebKit::WebNavigationPolicy policy,
const WebKit::WebString& suggested_name);
- // The WebDataSource::ExtraData* is assumed to be a DocumentState* subclass.
- virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
- WebKit::WebFrame* frame,
- WebKit::WebDataSource::ExtraData* extraData,
- const WebKit::WebURLRequest& request,
- WebKit::WebNavigationType type,
- WebKit::WebNavigationPolicy default_policy,
- bool is_redirect);
- // DEPRECATED.
virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
WebKit::WebFrame* frame,
const WebKit::WebURLRequest& request,
@@ -208,6 +207,9 @@ class CONTENT_EXPORT RenderFrameImpl
// RenderFrameImpl methods
int routing_id() { return routing_id_; }
+ protected:
+ RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
+
private:
RenderViewImpl* render_view_;
int routing_id_;
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698