summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_util.h
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-25 22:42:02 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-25 22:42:02 +0000
commit2b49673d0fd51ec44b9558bdd42e63d7047358d6 (patch)
treee86dff8dd51f8635be75be5fc2208a42f64a9d8b /chrome/browser/automation/automation_util.h
parent00bab587b3b4cf5de2f7cb9131e9ac882c921cd5 (diff)
downloadchromium_src-2b49673d0fd51ec44b9558bdd42e63d7047358d6.zip
chromium_src-2b49673d0fd51ec44b9558bdd42e63d7047358d6.tar.gz
chromium_src-2b49673d0fd51ec44b9558bdd42e63d7047358d6.tar.bz2
In chromedriver, do not hang when an alert becomes active during an action.
Prohibit certain actions when an alert is active. BUG=87679 TEST=none Review URL: http://codereview.chromium.org/7492016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_util.h')
-rw-r--r--chrome/browser/automation/automation_util.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/automation/automation_util.h b/chrome/browser/automation/automation_util.h
index b15cf2a..fb3a3f6 100644
--- a/chrome/browser/automation/automation_util.h
+++ b/chrome/browser/automation/automation_util.h
@@ -72,6 +72,11 @@ void SetCookieJSON(AutomationProvider* provider,
base::DictionaryValue* args,
IPC::Message* reply_message);
+// Sends a JSON error reply if an app modal dialog is active. Returns whether
+// an error reply was sent.
+bool SendErrorIfModalDialogActive(AutomationProvider* provider,
+ IPC::Message* message);
+
} // namespace automation_util
#endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_UTIL_H_