diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:18:07 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:18:07 +0000 |
| commit | a455d381543e773418e645b3192c8731430a646e (patch) | |
| tree | f52ea9e8a6a2db06957637b8698d7c5007b2e4a5 /chrome/browser/jsmessage_box_handler_win.h | |
| parent | 2eb312b025971ee1529b3a6c67d715055cb77906 (diff) | |
| download | chromium_src-a455d381543e773418e645b3192c8731430a646e.zip chromium_src-a455d381543e773418e645b3192c8731430a646e.tar.gz chromium_src-a455d381543e773418e645b3192c8731430a646e.tar.bz2 | |
Try #2 of "make JavaScript alerts reflect the URL of the frame they came from,
not the enclosing frame." The diffrence between this one and the previous version
of this patch is the addition of test_webview_delegate.
BUG=1686837
Review URL: http://codereview.chromium.org/39163
Review URL: http://codereview.chromium.org/40175
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jsmessage_box_handler_win.h')
| -rw-r--r-- | chrome/browser/jsmessage_box_handler_win.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/jsmessage_box_handler_win.h b/chrome/browser/jsmessage_box_handler_win.h index bac80dd..e8049d9 100644 --- a/chrome/browser/jsmessage_box_handler_win.h +++ b/chrome/browser/jsmessage_box_handler_win.h @@ -10,6 +10,7 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/views/app_modal_dialog_delegate.h" +#include "googleurl/src/gurl.h" class MessageBoxView; class WebContents; @@ -23,6 +24,7 @@ class JavascriptMessageBoxHandler public: // Cross-platform code should use RunJavaScriptMessageBox. JavascriptMessageBoxHandler(WebContents* web_contents, + const GURL& frame_url, int dialog_flags, const std::wstring& message_text, const std::wstring& default_prompt_text, @@ -64,6 +66,10 @@ class JavascriptMessageBoxHandler // The associated WebContents. Used to send IPC messages to the renderer. WebContents* web_contents_; + // The URL of the frame originating the dialog. It is important we display + // this so the user doesn't blame the enclosing site if a subframe alert()s. + GURL frame_url_; + // Stores flags defined in message_box_view.h which describe the dialog box. int dialog_flags_; |