| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/chromedriver/alert_commands.h" | 5 #include "chrome/test/chromedriver/alert_commands.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/test/chromedriver/chrome/chrome.h" | 9 #include "chrome/test/chromedriver/chrome/chrome.h" |
| 10 #include "chrome/test/chromedriver/chrome/devtools_client.h" | 10 #include "chrome/test/chromedriver/chrome/devtools_client.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 Status ExecuteGetAlertText(Session* session, | 51 Status ExecuteGetAlertText(Session* session, |
| 52 WebView* web_view, | 52 WebView* web_view, |
| 53 const base::DictionaryValue& params, | 53 const base::DictionaryValue& params, |
| 54 std::unique_ptr<base::Value>* value) { | 54 std::unique_ptr<base::Value>* value) { |
| 55 std::string message; | 55 std::string message; |
| 56 Status status = | 56 Status status = |
| 57 web_view->GetJavaScriptDialogManager()->GetDialogMessage(&message); | 57 web_view->GetJavaScriptDialogManager()->GetDialogMessage(&message); |
| 58 if (status.IsError()) | 58 if (status.IsError()) |
| 59 return status; | 59 return status; |
| 60 value->reset(new base::StringValue(message)); | 60 value->reset(new base::Value(message)); |
| 61 return Status(kOk); | 61 return Status(kOk); |
| 62 } | 62 } |
| 63 | 63 |
| 64 Status ExecuteSetAlertValue(Session* session, | 64 Status ExecuteSetAlertValue(Session* session, |
| 65 WebView* web_view, | 65 WebView* web_view, |
| 66 const base::DictionaryValue& params, | 66 const base::DictionaryValue& params, |
| 67 std::unique_ptr<base::Value>* value) { | 67 std::unique_ptr<base::Value>* value) { |
| 68 std::string text; | 68 std::string text; |
| 69 if (!params.GetString("text", &text)) | 69 if (!params.GetString("text", &text)) |
| 70 return Status(kUnknownError, "missing or invalid 'text'"); | 70 return Status(kUnknownError, "missing or invalid 'text'"); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 88 | 88 |
| 89 Status ExecuteDismissAlert(Session* session, | 89 Status ExecuteDismissAlert(Session* session, |
| 90 WebView* web_view, | 90 WebView* web_view, |
| 91 const base::DictionaryValue& params, | 91 const base::DictionaryValue& params, |
| 92 std::unique_ptr<base::Value>* value) { | 92 std::unique_ptr<base::Value>* value) { |
| 93 Status status = web_view->GetJavaScriptDialogManager() | 93 Status status = web_view->GetJavaScriptDialogManager() |
| 94 ->HandleDialog(false, session->prompt_text.get()); | 94 ->HandleDialog(false, session->prompt_text.get()); |
| 95 session->prompt_text.reset(); | 95 session->prompt_text.reset(); |
| 96 return status; | 96 return status; |
| 97 } | 97 } |
| OLD | NEW |