diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 17:41:40 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 17:41:40 +0000 |
| commit | 5f45b5c09370ed31a5e114e409db308a4190e592 (patch) | |
| tree | 76965315659d0e653b80f94c05fd64d1e42b5242 /content/browser/browser_plugin | |
| parent | 2f2679a718c53cf2cfcef0aaaf364e84d594ee95 (diff) | |
| download | chromium_src-5f45b5c09370ed31a5e114e409db308a4190e592.zip chromium_src-5f45b5c09370ed31a5e114e409db308a4190e592.tar.gz chromium_src-5f45b5c09370ed31a5e114e409db308a4190e592.tar.bz2 | |
Plumb user_gesture up from Blink to the JavaScript dialog code, and don't offer to suppress dialogs if they're initiated by a user gesture.
BUG=263192
TEST=as in bug
Review URL: https://chromiumcodereview.appspot.com/22909052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 1 | ||||
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 96e60e1..bb92c9e 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -1549,6 +1549,7 @@ void BrowserPluginGuest::RunJavaScriptDialog( JavaScriptMessageType javascript_message_type, const string16& message_text, const string16& default_prompt_text, + bool user_gesture, const DialogClosedCallback& callback, bool* did_suppress_message) { if (permission_request_map_.size() >= kNumMaxOutstandingPermissionRequests) { diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index 74624ef..15d28d2 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -213,6 +213,7 @@ class CONTENT_EXPORT BrowserPluginGuest JavaScriptMessageType javascript_message_type, const string16& message_text, const string16& default_prompt_text, + bool user_gesture, const DialogClosedCallback& callback, bool* did_suppress_message) OVERRIDE; virtual void RunBeforeUnloadDialog( |