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

chrome/browser/jsmessage_box_handler_win.cc

 // 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.
 
 #include "chrome/browser/jsmessage_box_handler_win.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/message_box_view.h"
 #include "chrome/views/window.h"
 #include "grit/generated_resources.h"
 
 void RunJavascriptMessageBox(WebContents* web_contents,
+                             const GURL& frame_url,
                              int dialog_flags,
                              const std::wstring& message_text,
                              const std::wstring& default_prompt_text,
                              bool display_suppress_checkbox,
                              IPC::Message* reply_msg) {
   JavascriptMessageBoxHandler* handler =
-      new JavascriptMessageBoxHandler(web_contents, dialog_flags,
+      new JavascriptMessageBoxHandler(web_contents, frame_url, dialog_flags,
                                       message_text, default_prompt_text,
                                       display_suppress_checkbox, reply_msg);
   AppModalDialogQueue::AddDialog(handler);
 }
 
 JavascriptMessageBoxHandler::JavascriptMessageBoxHandler(
     WebContents* web_contents,
+    const GURL& frame_url,
     int dialog_flags,
     const std::wstring& message_text,
     const std::wstring& default_prompt_text,
     bool display_suppress_checkbox,
     IPC::Message* reply_msg)
-      : web_contents_(web_contents),
-        reply_msg_(reply_msg),
-        dialog_flags_(dialog_flags),
-        dialog_(NULL),
-        message_box_view_(new MessageBoxView(
-            dialog_flags | MessageBoxView::kAutoDetectAlignment,
-            message_text, default_prompt_text)) {
+    : web_contents_(web_contents),
+      frame_url_(frame_url),
+      reply_msg_(reply_msg),
+      dialog_flags_(dialog_flags),
+      dialog_(NULL),
+      message_box_view_(new MessageBoxView(
+          dialog_flags | MessageBoxView::kAutoDetectAlignment,
+          message_text, default_prompt_text)) {
   DCHECK(message_box_view_);
   DCHECK(reply_msg_);
 
   if (display_suppress_checkbox) {
     message_box_view_->SetCheckBoxLabel(
         l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
   }
 
   // Make sure we get navigation notifications so we know when our parent
   // contents will disappear or navigate to a different page.
@@ skipping 14 matching lines @@
   if (dialog_flags_ & MessageBoxView::kFlagHasOKButton)
     dialog_buttons = DIALOGBUTTON_OK;
 
   if (dialog_flags_ & MessageBoxView::kFlagHasCancelButton)
     dialog_buttons |= DIALOGBUTTON_CANCEL;
 
   return dialog_buttons;
 }
 
 std::wstring JavascriptMessageBoxHandler::GetWindowTitle() const {
-  if (!web_contents_)
-    return std::wstring();
-
-  GURL url = web_contents_->GetURL();
-  if (!url.has_host())
+  if (!frame_url_.has_host())
     return l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
 
   // We really only want the scheme, hostname, and port.
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearPath();
   replacements.ClearQuery();
   replacements.ClearRef();
-  GURL clean_url = url.ReplaceComponents(replacements);
+  GURL clean_url = frame_url_.ReplaceComponents(replacements);
 
   // TODO(brettw) it should be easier than this to do the correct language
   // handling without getting the accept language from the profile.
   std::wstring base_address = gfx::ElideUrl(clean_url, ChromeFont(), 0,
       web_contents_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages));
   // Force URL to have LTR directionality.
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
     l10n_util::WrapStringWithLTRFormatting(&base_address);
   return l10n_util::GetStringF(IDS_JAVASCRIPT_MESSAGEBOX_TITLE, base_address);
 }
@@ skipping 93 matching lines @@
     web_contents_gone = true;
 
   if (web_contents_gone) {
     web_contents_ = NULL;
 
     // If the dialog is visible close it.
     if (dialog_)
       dialog_->Close();
   }
 }