Index: content/browser/renderer_host/render_view_host_impl.cc |
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
index 9c242e8d947ac9437665b100b664f718a14d66fd..02ef1c3115573781755130ef80211821c01b0750 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -207,8 +207,6 @@ RenderViewHostImpl::RenderViewHostImpl( |
navigations_suspended_(false), |
has_accessed_initial_document_(false), |
main_frame_routing_id_(main_frame_routing_id), |
- run_modal_reply_msg_(NULL), |
- run_modal_opener_id_(MSG_ROUTING_NONE), |
is_waiting_for_beforeunload_ack_(false), |
unload_ack_is_for_cross_site_transition_(false), |
are_javascript_messages_suppressed_(false), |
@@ -1174,7 +1172,6 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { |
IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) |
IPC_MESSAGE_HANDLER(ViewHostMsg_ShowFullscreenWidget, |
OnShowFullscreenWidget) |
- IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnRunModal) |
IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady) |
IPC_MESSAGE_HANDLER(ViewHostMsg_RenderProcessGone, OnRenderProcessGone) |
IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateState, OnUpdateState) |
@@ -1262,25 +1259,6 @@ void RenderViewHostImpl::Init() { |
RenderWidgetHostImpl::Init(); |
} |
-void RenderViewHostImpl::Shutdown() { |
- // If we are being run modally (see RunModal), then we need to cleanup. |
- if (run_modal_reply_msg_) { |
- Send(run_modal_reply_msg_); |
- run_modal_reply_msg_ = NULL; |
- RenderViewHostImpl* opener = |
- RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_); |
- if (opener) { |
- opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds( |
- hung_renderer_delay_ms_)); |
- // Balance out the decrement when we got created. |
- opener->increment_in_flight_event_count(); |
- } |
- run_modal_opener_id_ = MSG_ROUTING_NONE; |
- } |
- |
- RenderWidgetHostImpl::Shutdown(); |
-} |
- |
bool RenderViewHostImpl::IsRenderView() const { |
return true; |
} |
@@ -1333,26 +1311,6 @@ void RenderViewHostImpl::OnShowFullscreenWidget(int route_id) { |
Send(new ViewMsg_Move_ACK(route_id)); |
} |
-void RenderViewHostImpl::OnRunModal(int opener_id, IPC::Message* reply_msg) { |
- DCHECK(!run_modal_reply_msg_); |
- run_modal_reply_msg_ = reply_msg; |
- run_modal_opener_id_ = opener_id; |
- |
- RecordAction(base::UserMetricsAction("ShowModalDialog")); |
- |
- RenderViewHostImpl* opener = |
- RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_); |
- if (opener) { |
- opener->StopHangMonitorTimeout(); |
- // The ack for the mouse down won't come until the dialog closes, so fake it |
- // so that we don't get a timeout. |
- opener->decrement_in_flight_event_count(); |
- } |
- |
- // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in |
- // an app-modal fashion. |
-} |
- |
void RenderViewHostImpl::OnRenderViewReady() { |
render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING; |
SendScreenRects(); |