diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 13:20:11 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 13:20:11 +0000 |
| commit | 4567f159728ad4d70cb81bb3bc19d8614c491421 (patch) | |
| tree | 6a24cdbe0a7055f0546b4ae45e93aedb6105bdcf /android_webview | |
| parent | 7ffde54619efd0ad76885e3d65cd800a56599f74 (diff) | |
| download | chromium_src-4567f159728ad4d70cb81bb3bc19d8614c491421.zip chromium_src-4567f159728ad4d70cb81bb3bc19d8614c491421.tar.gz chromium_src-4567f159728ad4d70cb81bb3bc19d8614c491421.tar.bz2 | |
Persist JavaScript dialog state across page navigations.
This prevents a single WebContents from annoying the user with JavaScript alert loops, no matter what the page does in-between (e.g. reload, switch sites).
BUG=265475
TEST=as in bug
TBR=mnaganov@chromium.org
Review URL: https://chromiumcodereview.appspot.com/21111002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_javascript_dialog_manager.cc | 6 | ||||
| -rw-r--r-- | android_webview/browser/aw_javascript_dialog_manager.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc index 4e9f6195..1690eac 100644 --- a/android_webview/browser/aw_javascript_dialog_manager.cc +++ b/android_webview/browser/aw_javascript_dialog_manager.cc @@ -44,7 +44,11 @@ void AwJavaScriptDialogManager::RunBeforeUnloadDialog( callback); } -void AwJavaScriptDialogManager::ResetJavaScriptState( +void AwJavaScriptDialogManager::CancelActiveAndPendingDialogs( + content::WebContents* web_contents) { +} + +void AwJavaScriptDialogManager::WebContentsDestroyed( content::WebContents* web_contents) { } diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h index 69436dd..f8db746 100644 --- a/android_webview/browser/aw_javascript_dialog_manager.h +++ b/android_webview/browser/aw_javascript_dialog_manager.h @@ -29,7 +29,9 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager { const string16& message_text, bool is_reload, const DialogClosedCallback& callback) OVERRIDE; - virtual void ResetJavaScriptState( + virtual void CancelActiveAndPendingDialogs( + content::WebContents* web_contents) OVERRIDE; + virtual void WebContentsDestroyed( content::WebContents* web_contents) OVERRIDE; private: |