Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chrome/test/chromedriver/session_commands.cc

Issue 15393005: [chromedriver] Remove unnecessary round trips to Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/session_commands.h ('k') | chrome/test/chromedriver/window_commands.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/session_commands.cc
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index a2f088c2b892cb1aac3a4395beea4a621c71aafe..dadc666e783da1eebd75f821fe9617abe2a71a85 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc
@@ -289,90 +289,6 @@ Status ExecuteImplicitlyWait(
return Status(kOk);
}
-Status ExecuteAlertCommand(
- const SessionCommand& alert_command,
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- WebView* web_view = NULL;
- Status status = session->GetTargetWindow(&web_view);
- if (status.IsError())
- return status;
-
- status = web_view->ConnectIfNecessary();
- if (status.IsError())
- return status;
-
- status = web_view->WaitForPendingNavigations(session->GetCurrentFrameId());
- if (status.IsError() && status.code() != kUnexpectedAlertOpen)
- return status;
-
- return alert_command.Run(session, params, value);
-}
-
-Status ExecuteGetAlert(
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- bool is_open;
- Status status = session->chrome->IsJavaScriptDialogOpen(&is_open);
- if (status.IsError())
- return status;
- value->reset(base::Value::CreateBooleanValue(is_open));
- return Status(kOk);
-}
-
-Status ExecuteGetAlertText(
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- std::string message;
- Status status = session->chrome->GetJavaScriptDialogMessage(&message);
- if (status.IsError())
- return status;
- value->reset(base::Value::CreateStringValue(message));
- return Status(kOk);
-}
-
-Status ExecuteSetAlertValue(
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- std::string text;
- if (!params.GetString("text", &text))
- return Status(kUnknownError, "missing or invalid 'text'");
-
- bool is_open;
- Status status = session->chrome->IsJavaScriptDialogOpen(&is_open);
- if (status.IsError())
- return status;
- if (!is_open)
- return Status(kNoAlertOpen);
-
- session->prompt_text.reset(new std::string(text));
- return Status(kOk);
-}
-
-Status ExecuteAcceptAlert(
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- Status status = session->chrome->HandleJavaScriptDialog(
- true, session->prompt_text.get());
- session->prompt_text.reset();
- return status;
-}
-
-Status ExecuteDismissAlert(
- Session* session,
- const base::DictionaryValue& params,
- scoped_ptr<base::Value>* value) {
- Status status = session->chrome->HandleJavaScriptDialog(
- false, session->prompt_text.get());
- session->prompt_text.reset();
- return status;
-}
-
Status ExecuteIsLoading(
Session* session,
const base::DictionaryValue& params,
« no previous file with comments | « chrome/test/chromedriver/session_commands.h ('k') | chrome/test/chromedriver/window_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698