Make JavaScript alerts reflect the URL of the frame they came from, not the...

chrome/common/render_messages_internal.h

 // Copyright (c) 2006-2008 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
 #include <string>
 #include <vector>
@@ skipping 737 matching lines @@
   // Initiate a download based on user actions like 'ALT+click'.
   IPC_MESSAGE_ROUTED2(ViewHostMsg_DownloadUrl,
                       GURL /* url */,
                       GURL /* referrer */)
 
   // Used to go to the session history entry at the given offset (ie, -1 will
   // return the "back" item).
   IPC_MESSAGE_ROUTED1(ViewHostMsg_GoToEntryAtOffset,
                       int /* offset (from current) of history item to get */)
 
-  IPC_SYNC_MESSAGE_ROUTED3_2(ViewHostMsg_RunJavaScriptMessage,
+  IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage,
                              std::wstring /* in - alert message */,
                              std::wstring /* in - default prompt */,
+                             GURL         /* in - originating page URL */,
                              int          /* in - dialog flags */,
                              bool         /* out - success */,
                              std::wstring /* out - prompt field */)
 
   // Sets the contents for the given page (URL and page ID are the first two
   // arguments) given the contents that is the 3rd.
   IPC_MESSAGE_CONTROL3(ViewHostMsg_PageContents, GURL, int32, std::wstring)
 
   // Specifies the URL as the first parameter (a wstring) and thumbnail as
   // binary data as the second parameter.
@@ skipping 254 matching lines @@
   // crashed.
   IPC_MESSAGE_ROUTED1(ViewHostMsg_CrashedPlugin,
                       FilePath /* plugin_path */)
 
   // Dsiplays a JavaScript out-of-memory message in the infobar.
   IPC_MESSAGE_ROUTED0(ViewHostMsg_JSOutOfMemory)
 
   // Displays a box to confirm that the user wants to navigate away from the
   // page. Replies true if yes, false otherwise, the reply string is ignored,
   // but is included so that we can use OnJavaScriptMessageBoxClosed.
-  IPC_SYNC_MESSAGE_ROUTED1_2(ViewHostMsg_RunBeforeUnloadConfirm,
+  IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_RunBeforeUnloadConfirm,
+                             GURL,        /* in - originating frame URL */
                              std::wstring /* in - alert message */,
                              bool         /* out - success */,
                              std::wstring /* out - This is ignored.*/)
 
   IPC_MESSAGE_ROUTED3(ViewHostMsg_SendCurrentPageAllSavableResourceLinks,
                       std::vector<GURL> /* all savable resource links */,
                       std::vector<GURL> /* all referrers of resource links */,
                       std::vector<GURL> /* all frame links */)
 
   IPC_MESSAGE_ROUTED3(ViewHostMsg_SendSerializedHtmlData,
@@ skipping 156 matching lines @@
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_CreateDedicatedWorker,
                               GURL /* url */,
                               int /* route_id */)
 
   // Wraps an IPC message that's destined to the worker on the renderer->browser
   // hop.
   IPC_MESSAGE_CONTROL1(ViewHostMsg_ForwardToWorker,
                        IPC::Message /* message */)
 
 IPC_END_MESSAGES(ViewHost)