Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index 28fec349cdc100fca0ee8eb81fea24fb929d0cc1..79bc9b3cf39bb581c0218bc1a38c807c161f23c9 100644 |
--- a/content/renderer/render_view_impl.h |
+++ b/content/renderer/render_view_impl.h |
@@ -35,6 +35,7 @@ |
#include "content/public/common/top_controls_state.h" |
#include "content/public/renderer/render_view.h" |
#include "content/renderer/mouse_lock_dispatcher.h" |
+#include "content/renderer/render_frame_impl.h" |
#include "content/renderer/render_view_pepper_helper.h" |
#include "content/renderer/render_widget.h" |
#include "content/renderer/renderer_webcookiejar_impl.h" |
@@ -212,6 +213,7 @@ class CONTENT_EXPORT RenderViewImpl |
const WebPreferences& webkit_prefs, |
SharedRenderViewCounter* counter, |
int32 routing_id, |
+ int32 main_frame_routing_id, |
int32 surface_id, |
int64 session_storage_namespace_id, |
const string16& frame_name, |
@@ -866,6 +868,7 @@ class CONTENT_EXPORT RenderViewImpl |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
ShouldUpdateSelectionTextFromContextMenuParams); |
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); |
typedef std::map<GURL, double> HostZoomLevels; |
@@ -1367,6 +1370,8 @@ class CONTENT_EXPORT RenderViewImpl |
// Helper objects ------------------------------------------------------------ |
+ scoped_ptr<RenderFrameImpl> main_render_frame_; |
+ |
RendererWebCookieJarImpl cookie_jar_; |
// The next group of objects all implement RenderViewObserver, so are deleted |