| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 06fb8752a86d97a3c56facfbc0942f37d9e1ee02..c1c85f32765c4a343e78660f51dc2187b96e4446 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -1716,6 +1716,8 @@ bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
|
| // equivalent of WebView::willEnterModalLoop. In the case of showModalDialog
|
| // it is particularly important that we do not call willEnterModalLoop as
|
| // that would defer resource loads for the dialog itself.
|
| + // TODO(jamesr): Now that we no longer support showModalDialog, see if we can
|
| + // simplify this logic.
|
| if (RenderThreadImpl::current()) // Will be NULL during unit tests.
|
| RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
|
|
|
| @@ -2423,28 +2425,6 @@ void RenderViewImpl::show(WebNavigationPolicy policy) {
|
| SetPendingWindowRect(initial_pos_);
|
| }
|
|
|
| -void RenderViewImpl::runModal() {
|
| - DCHECK(did_show_) << "should already have shown the view";
|
| -
|
| - // Don't allow further dialogs if we are waiting to swap out, since the
|
| - // PageGroupLoadDeferrer in our stack prevents it.
|
| - if (suppress_dialogs_until_swap_out_)
|
| - return;
|
| -
|
| - // We must keep WebKit's shared timer running in this case in order to allow
|
| - // showModalDialog to function properly.
|
| - //
|
| - // TODO(darin): WebKit should really be smarter about suppressing events and
|
| - // timers so that we do not need to manage the shared timer in such a heavy
|
| - // handed manner.
|
| - //
|
| - if (RenderThreadImpl::current()) // Will be NULL during unit tests.
|
| - RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
|
| -
|
| - SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
|
| - routing_id_, opener_id_));
|
| -}
|
| -
|
| bool RenderViewImpl::enterFullScreen() {
|
| Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
|
| return true;
|
|
|