remove main_render_frame(), use GetMainRenderFrame() instead
CL 93333002 added a main_render_frame() method to RenderFrameImpl,
then about a week later CL 107893003 added a virtual
GetMainRenderFrame() method with the same implementation.
To avoid confusion, we could just use the latter and remove
main_render_frame().
BUG=304341
Review URL: https://codereview.chromium.org/554743009
Cr-Commit-Position: refs/heads/master@{#294562}
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index dc1ed10..1399a0f 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -340,8 +340,8 @@
params.url = url;
params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
- impl->main_render_frame()->OnNavigate(params);
- FrameLoadWaiter(impl->main_render_frame()).Wait();
+ impl->GetMainRenderFrame()->OnNavigate(params);
+ FrameLoadWaiter(impl->GetMainRenderFrame()).Wait();
}
uint32 RenderViewTest::GetNavigationIPCType() {
@@ -372,7 +372,7 @@
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
blink::WebHistoryItem item;
item.initialize();
- impl->main_render_frame()->didNavigateWithinPage(
+ impl->GetMainRenderFrame()->didNavigateWithinPage(
frame,
item,
is_new_navigation ? blink::WebStandardCommit
@@ -419,9 +419,9 @@
navigate_params.page_state = state;
navigate_params.request_time = base::Time::Now();
- FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
+ FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(),
navigate_params);
- impl->main_render_frame()->OnMessageReceived(navigate_message);
+ impl->GetMainRenderFrame()->OnMessageReceived(navigate_message);
// The load actually happens asynchronously, so we pump messages to process
// the pending continuation.
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 6bb5c79..45b91304 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -324,7 +324,7 @@
accessibility->HandleAXEvent(
root_obj,
ui::AX_EVENT_VALUE_CHANGED);
- view()->main_render_frame()->OnSwapOut(kProxyRoutingId);
+ view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
accessibility->SendPendingAccessibilityEvents();
EXPECT_FALSE(sink_->GetUniqueMessageMatching(
AccessibilityHostMsg_Events::ID));
diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc
index 1152435..e58d764 100644
--- a/content/renderer/external_popup_menu_browsertest.cc
+++ b/content/renderer/external_popup_menu_browsertest.cc
@@ -30,7 +30,7 @@
}
RenderFrameImpl* frame() {
- return view()->main_render_frame();
+ return view()->GetMainRenderFrame();
}
virtual void SetUp() {
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
index 05b46df..d6f1abd 100644
--- a/content/renderer/history_controller.cc
+++ b/content/renderer/history_controller.cc
@@ -60,7 +60,7 @@
provisional_entry_ = target_entry.Pass();
- WebFrame* main_frame = render_view_->main_render_frame()->GetWebFrame();
+ WebFrame* main_frame = render_view_->GetMainRenderFrame()->GetWebFrame();
if (current_entry_) {
RecursiveGoToEntry(
main_frame, same_document_loads, different_document_loads);
diff --git a/content/renderer/history_entry.cc b/content/renderer/history_entry.cc
index ef4b768..d1425165 100644
--- a/content/renderer/history_entry.cc
+++ b/content/renderer/history_entry.cc
@@ -189,7 +189,7 @@
new_item,
clone_children_of_target,
target_frame,
- render_view->main_render_frame()));
+ render_view->GetMainRenderFrame()));
return new_entry;
}
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc
index 76d764d4..0262e39 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.cc
+++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
@@ -313,7 +313,7 @@
// shouldn't happen, since if we got here the plugin should exist) or the
// plugin crashed on initialization.
if (!info_.path.empty()) {
- render_view_->main_render_frame()->PluginCrashed(
+ render_view_->GetMainRenderFrame()->PluginCrashed(
info_.path, base::kNullProcessId);
LOG(ERROR) << "Plug-in crashed on start";
@@ -487,7 +487,7 @@
plugin_->Invalidate();
}
if (channel_host_.get() && !channel_host_->expecting_shutdown()) {
- render_view_->main_render_frame()->PluginCrashed(
+ render_view_->GetMainRenderFrame()->PluginCrashed(
info_.path, channel_host_->peer_pid());
}
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index b79d8d72..e3ed9fa 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -502,7 +502,7 @@
RenderProcess::current()->AddRefProcess();
// Respond to a swap out request.
- view()->main_render_frame()->OnSwapOut(kProxyRoutingId);
+ view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
// Ensure the swap out commits synchronously.
EXPECT_NE(initial_page_id, view_page_id());
@@ -515,7 +515,7 @@
// It is possible to get another swap out request. Ensure that we send
// an ACK, even if we don't have to do anything else.
render_thread_->sink().ClearMessages();
- view()->main_render_frame()->OnSwapOut(kProxyRoutingId);
+ view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
const IPC::Message* msg2 = render_thread_->sink().GetUniqueMessageMatching(
FrameHostMsg_SwapOut_ACK::ID);
ASSERT_TRUE(msg2);
@@ -573,7 +573,7 @@
ProcessPendingMessages();
// Respond to a swap out request.
- view()->main_render_frame()->OnSwapOut(kProxyRoutingId);
+ view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
// Check for a OnSwapOutACK.
const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
@@ -1557,7 +1557,7 @@
frame()->OnNavigate(params);
// An error occurred.
- view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
+ view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
// Frame should exit view-source mode.
EXPECT_FALSE(web_frame->isViewSourceModeEnabled());
}
@@ -1580,7 +1580,7 @@
frame()->OnNavigate(params);
// A cancellation occurred.
- view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
+ view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
// Frame should stay in view-source mode.
EXPECT_TRUE(web_frame->isViewSourceModeEnabled());
}
@@ -2166,7 +2166,7 @@
frame()->OnNavigate(params);
// An error occurred.
- view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
+ view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
const int kMaxOutputCharacters = 22;
EXPECT_EQ("",
base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
@@ -2196,7 +2196,7 @@
frame()->OnNavigate(params);
// An error occurred.
- view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
+ view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
// The error page itself is loaded asynchronously.
FrameLoadWaiter(frame()).Wait();
const int kMaxOutputCharacters = 22;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f0865b0d..59c5664f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1966,7 +1966,7 @@
FOR_EACH_OBSERVER(RenderViewObserver, observers_, FocusedNodeChanged(node));
// TODO(dmazzoni): this should be part of RenderFrameObserver.
- main_render_frame()->FocusedNodeChanged(node);
+ GetMainRenderFrame()->FocusedNodeChanged(node);
}
void RenderViewImpl::didUpdateLayout() {
@@ -2463,7 +2463,7 @@
return RenderWidget::Send(message);
}
-RenderFrame* RenderViewImpl::GetMainRenderFrame() {
+RenderFrameImpl* RenderViewImpl::GetMainRenderFrame() {
return main_render_frame_.get();
}
@@ -4038,7 +4038,7 @@
// Never show a disambiguation popup when accessibility is enabled,
// as this interferes with "touch exploration".
AccessibilityMode accessibility_mode =
- main_render_frame()->accessibility_mode();
+ GetMainRenderFrame()->accessibility_mode();
bool matches_accessibility_mode_complete =
(accessibility_mode & AccessibilityModeComplete) ==
AccessibilityModeComplete;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 6727118..eda3369 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -212,8 +212,6 @@
send_content_state_immediately_ = value;
}
- RenderFrameImpl* main_render_frame() { return main_render_frame_.get(); }
-
MouseLockDispatcher* mouse_lock_dispatcher() {
return mouse_lock_dispatcher_;
}
@@ -463,7 +461,7 @@
// RenderView implementation -------------------------------------------------
virtual bool Send(IPC::Message* message) OVERRIDE;
- virtual RenderFrame* GetMainRenderFrame() OVERRIDE;
+ virtual RenderFrameImpl* GetMainRenderFrame() OVERRIDE;
virtual int GetRoutingID() const OVERRIDE;
virtual gfx::Size GetSize() const OVERRIDE;
virtual WebPreferences& GetWebkitPreferences() OVERRIDE;
