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/extensions | |
| 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/extensions')
| -rwxr-xr-x | chrome/browser/extensions/extension_view.cc | 1 | ||||
| -rwxr-xr-x | chrome/browser/extensions/extension_view.h | 1 | ||||
| -rwxr-xr-x | chrome/browser/extensions/extension_view_unittest.cc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_view.cc b/chrome/browser/extensions/extension_view.cc index 1647ecb..883ac3a 100755 --- a/chrome/browser/extensions/extension_view.cc +++ b/chrome/browser/extensions/extension_view.cc @@ -22,6 +22,7 @@ WebPreferences ExtensionView::GetWebkitPrefs() { void ExtensionView::RunJavaScriptMessage( const std::wstring& message, const std::wstring& default_prompt, + const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message) { diff --git a/chrome/browser/extensions/extension_view.h b/chrome/browser/extensions/extension_view.h index 5eb869c..d95b745 100755 --- a/chrome/browser/extensions/extension_view.h +++ b/chrome/browser/extensions/extension_view.h @@ -35,6 +35,7 @@ class ExtensionView : public HWNDHtmlView, virtual void RunJavaScriptMessage( const std::wstring& message, const std::wstring& default_prompt, + const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message); diff --git a/chrome/browser/extensions/extension_view_unittest.cc b/chrome/browser/extensions/extension_view_unittest.cc index 61cd8de..43341ce 100755 --- a/chrome/browser/extensions/extension_view_unittest.cc +++ b/chrome/browser/extensions/extension_view_unittest.cc @@ -43,6 +43,7 @@ class MockExtensionView : public ExtensionView { virtual void RunJavaScriptMessage( const std::wstring& message, const std::wstring& default_prompt, + const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message) { |