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

content/common/view_messages.h

 // Copyright (c) 2012 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.
 
 // IPC messages for page rendering.
 // Multiply-included message file, hence no include guard.
 
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "content/common/content_export.h"
@@ skipping 1229 matching lines @@
 IPC_MESSAGE_ROUTED2(ViewHostMsg_ShowWidget,
                     int /* route_id */,
                     gfx::Rect /* initial_pos */)
 
 // Message to show a full screen widget.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_ShowFullscreenWidget,
                     int /* route_id */)
 
 // This message is sent after ViewHostMsg_ShowView to cause the RenderView
 // to run in a modal fashion until it is closed.
-IPC_SYNC_MESSAGE_ROUTED0_0(ViewHostMsg_RunModal)
+IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_RunModal,
+                           int /* opener_id */)
 
 // Indicates the renderer is ready in response to a ViewMsg_New or
 // a ViewMsg_CreatingNew_ACK.
 IPC_MESSAGE_ROUTED0(ViewHostMsg_RenderViewReady)
 
 // Indicates the renderer process is gone.  This actually is sent by the
 // browser process to itself, but keeps the interface cleaner.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_RenderViewGone,
                     int, /* this really is base::TerminationStatus */
                     int /* exit_code */)
@@ skipping 728 matching lines @@
 // have a javascript send a native value (string, number, boolean) to the
 // listener in Cpp. (DomAutomationController)
 IPC_MESSAGE_ROUTED2(ViewHostMsg_DomOperationResponse,
                     std::string  /* json_string */,
                     int  /* automation_id */)
 
 // Enable or disable inverting of web content pixels, for users who prefer
 // white-on-black.
 IPC_MESSAGE_ROUTED1(ViewMsg_InvertWebContent,
                     bool /* invert */)