Merge 136701 - Disable the hang dialog detector when showModalDialog is running.

content/browser/renderer_host/render_view_host_impl.h

Index: content/browser/renderer_host/render_view_host_impl.h
===================================================================
--- content/browser/renderer_host/render_view_host_impl.h	(revision 138273)
+++ content/browser/renderer_host/render_view_host_impl.h	(working copy)
@@ -429,7 +429,7 @@
                      bool user_gesture);
   void OnMsgShowWidget(int route_id, const gfx::Rect& initial_pos);
   void OnMsgShowFullscreenWidget(int route_id);
-  void OnMsgRunModal(IPC::Message* reply_msg);
+  void OnMsgRunModal(int opener_id, IPC::Message* reply_msg);
   void OnMsgRenderViewReady();
   void OnMsgRenderViewGone(int status, int error_code);
   void OnMsgNavigate(const IPC::Message& msg);
@@ -570,6 +570,8 @@
   // If we were asked to RunModal, then this will hold the reply_msg that we
   // must return to the renderer to unblock it.
   IPC::Message* run_modal_reply_msg_;
+  // This will hold the routing id of the RenderView that opened us.
+  int run_modal_opener_id_;
 
   // Set to true when there is a pending ViewMsg_ShouldClose message.  This
   // ensures we don't spam the renderer with multiple beforeunload requests.