diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:10:58 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:10:58 +0000 |
| commit | b56da61e79ee405291e8ea6b260f51a1541928d1 (patch) | |
| tree | 21fdef964b8efa4caedea151cdd0867815de528a /chrome/browser/automation/automation_util.cc | |
| parent | 938f4ea71a0e2806f4c50b4c6d59c1586f8aa399 (diff) | |
| download | chromium_src-b56da61e79ee405291e8ea6b260f51a1541928d1.zip chromium_src-b56da61e79ee405291e8ea6b260f51a1541928d1.tar.gz chromium_src-b56da61e79ee405291e8ea6b260f51a1541928d1.tar.bz2 | |
Have ChromeDriver return the correct error code for alerts.
Also, don't throw an alert error in set selected if the selection causes
an alert.
BUG=94959
TEST=none
Review URL: http://codereview.chromium.org/8965008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_util.cc')
| -rw-r--r-- | chrome/browser/automation/automation_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 07b6909..a092763 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -397,8 +397,8 @@ bool SendErrorIfModalDialogActive(AutomationProvider* provider, IPC::Message* message) { bool active = AppModalDialogQueue::GetInstance()->HasActiveDialog(); if (active) { - AutomationJSONReply(provider, message).SendError( - "Command cannot be performed because a modal dialog is active"); + AutomationJSONReply(provider, message).SendErrorCode( + automation::kBlockedByModalDialog); } return active; } |