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_provider_json.h | |
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_provider_json.h')
-rw-r--r-- | chrome/browser/automation/automation_provider_json.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/automation/automation_provider_json.h b/chrome/browser/automation/automation_provider_json.h index b7a8674..7b46879 100644 --- a/chrome/browser/automation/automation_provider_json.h +++ b/chrome/browser/automation/automation_provider_json.h @@ -11,6 +11,7 @@ #include <string> #include "base/compiler_specific.h" +#include "chrome/common/automation_constants.h" class AutomationId; class AutomationProvider; @@ -47,7 +48,13 @@ class AutomationJSONReply { // Send an error reply along with error message |error_message|. void SendError(const std::string& error_message); + // Send an error reply along with the specified error code and its + // associated error message. + void SendErrorCode(automation::ErrorCode code); + private: + void SendErrorInternal(const automation::Error& error); + AutomationProvider* provider_; IPC::Message* message_; }; |