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

Unified Diff: content/renderer/render_view_impl.cc

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 | « content/renderer/render_frame_impl.cc ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 0e2189151a474775131a77c13fd679a8149e501b..7bcff2120e2e9fc8ea8ec348cde5ce26f961fc4f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -820,8 +820,9 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
}
void RenderViewImpl::Initialize(RenderViewImplParams* params) {
- main_render_frame_.reset(new RenderFrameImpl(
- this, params->main_frame_routing_id));
+ RenderFrameImpl* main_frame = RenderFrameImpl::Create(
+ this, params->main_frame_routing_id);
+ main_render_frame_.reset(main_frame);
#if defined(ENABLE_PLUGINS)
pepper_helper_.reset(new PepperPluginDelegateImpl(this));
@@ -899,7 +900,7 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
ShouldUseTransitionCompositing(device_scale_factor_));
webkit_glue::ApplyWebPreferences(webkit_preferences_, webview());
- webview()->initializeMainFrame(this);
+ webview()->initializeMainFrame(main_render_frame_.get());
if (switches::IsTouchDragDropEnabled())
webview()->settings()->setTouchDragDropEnabled(true);
@@ -2264,7 +2265,7 @@ bool RenderViewImpl::enumerateChosenDirectory(
void RenderViewImpl::initializeHelperPluginWebFrame(
WebKit::WebHelperPlugin* plugin) {
- plugin->initializeFrame(this);
+ plugin->initializeFrame(main_render_frame_.get());
}
void RenderViewImpl::didStartLoading() {
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698