Windowed plugins like Flash would cause the hung plugin dialog to show up whe...

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 541 matching lines @@
 
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
   }
 
   ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg,
                                                      success, prompt);
   Send(reply_msg);
 }
 
 void RenderViewHost::JavaScriptMessageBoxWindowDestroyed() {
- if (--modal_dialog_count_ == 0)
-   modal_dialog_event_->Reset();
+ ResetModalDialogEvent();
 }
 
 void RenderViewHost::ModalHTMLDialogClosed(IPC::Message* reply_msg,
                                            const std::string& json_retval) {
   if (is_waiting_for_unload_ack_)
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
-  if (--modal_dialog_count_ == 0)
-    modal_dialog_event_->Reset();
+  ResetModalDialogEvent();
 
   ViewHostMsg_ShowModalHTMLDialog::WriteReplyParams(reply_msg, json_retval);
   Send(reply_msg);
 }
 
 void RenderViewHost::CopyImageAt(int x, int y) {
   Send(new ViewMsg_CopyImageAt(routing_id(), x, y));
 }
 
 void RenderViewHost::DragSourceCancelledAt(
@@ skipping 222 matching lines @@
   if (!msg_is_ok) {
     // The message had a handler, but its de-serialization failed.
     // Kill the renderer.
     process()->ReceivedBadMessage(msg.type());
   }
 }
 
 void RenderViewHost::Shutdown() {
   // If we are being run modally (see RunModal), then we need to cleanup.
   if (run_modal_reply_msg_) {
-    if (--modal_dialog_count_ == 0)
-      modal_dialog_event_->Reset();
+    ResetModalDialogEvent();
     Send(run_modal_reply_msg_);
     run_modal_reply_msg_ = NULL;
   }
   RenderWidgetHost::Shutdown();
 }
 
 void RenderViewHost::CreateNewWindow(int route_id,
                                      ModalDialogEvent modal_dialog_event) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (!view)
@@ skipping 31 matching lines @@
                                      const gfx::Rect& initial_pos) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view) {
     view->ShowCreatedWidget(route_id, initial_pos);
     Send(new ViewMsg_Move_ACK(route_id));
   }
 }
 
 void RenderViewHost::OnMsgRunModal(IPC::Message* reply_msg) {
   DCHECK(!run_modal_reply_msg_);
-  if (modal_dialog_count_++ == 0)
-    modal_dialog_event_->Signal();
+  SignalModalDialogEvent();
   run_modal_reply_msg_ = reply_msg;
 
   // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in
   // an app-modal fashion.
 }
 
 void RenderViewHost::OnMsgRenderViewReady() {
   WasResized();
   delegate_->RenderViewReady(this);
 }
@@ skipping 313 matching lines @@
   delegate_->RunFileChooser(multiple_files, title, default_file);
 }
 
 void RenderViewHost::OnMsgRunJavaScriptMessage(
     const std::wstring& message,
     const std::wstring& default_prompt,
     const GURL& frame_url,
     const int flags,
     IPC::Message* reply_msg) {
   StopHangMonitorTimeout();
-  if (modal_dialog_count_++ == 0)
-    modal_dialog_event_->Signal();
+  SignalModalDialogEvent();
   delegate_->RunJavaScriptMessage(message, default_prompt, frame_url, flags,
                                   reply_msg,
                                   &are_javascript_messages_suppressed_);
 }
 
 void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url,
                                                  const std::wstring& message,
                                                  IPC::Message* reply_msg) {
   StopHangMonitorTimeout();
-  if (modal_dialog_count_++ == 0)
-    modal_dialog_event_->Signal();
+  SignalModalDialogEvent();
   delegate_->RunBeforeUnloadConfirm(message, reply_msg);
 }
 
 void RenderViewHost::OnMsgShowModalHTMLDialog(
     const GURL& url, int width, int height, const std::string& json_arguments,
     IPC::Message* reply_msg) {
   StopHangMonitorTimeout();
-  if (modal_dialog_count_++ == 0)
-    modal_dialog_event_->Signal();
+  SignalModalDialogEvent();
   delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg);
 }
 
 void RenderViewHost::OnMsgPasswordFormsSeen(
     const std::vector<webkit_glue::PasswordForm>& forms) {
   delegate_->PasswordFormsSeen(forms);
 }
 
 void RenderViewHost::OnMsgAutofillFormSubmitted(
     const webkit_glue::AutofillForm& form) {
@@ skipping 267 matching lines @@
   BrowserAccessibilityManager::GetInstance()->
       ChangeAccessibilityFocus(acc_obj_id, process()->pid(), routing_id());
 #else
   // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #endif
 }
 
 void RenderViewHost::OnCSSInserted() {
   delegate_->DidInsertCSS();
 }
+
+void RenderViewHost::SignalModalDialogEvent() {
+  if (modal_dialog_count_++ == 0)
+    modal_dialog_event_->Signal();
+}
+
+void RenderViewHost::ResetModalDialogEvent() {
+ if (--modal_dialog_count_ == 0)
+   modal_dialog_event_->Reset();
+}