| 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/element_commands.h" | 5 #include "chrome/test/chromedriver/element_commands.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <list> | 10 #include <list> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 return SendKeysOnWindow(web_view, key_list, true, &session->sticky_modifiers); | 78 return SendKeysOnWindow(web_view, key_list, true, &session->sticky_modifiers); |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace | 81 } // namespace |
| 82 | 82 |
| 83 Status ExecuteElementCommand( | 83 Status ExecuteElementCommand( |
| 84 const ElementCommand& command, | 84 const ElementCommand& command, |
| 85 Session* session, | 85 Session* session, |
| 86 WebView* web_view, | 86 WebView* web_view, |
| 87 const base::DictionaryValue& params, | 87 const base::DictionaryValue& params, |
| 88 scoped_ptr<base::Value>* value) { | 88 scoped_ptr<base::Value>* value, |
| 89 Timeout* timeout) { |
| 89 std::string id; | 90 std::string id; |
| 90 if (params.GetString("id", &id) || params.GetString("element", &id)) | 91 if (params.GetString("id", &id) || params.GetString("element", &id)) |
| 91 return command.Run(session, web_view, id, params, value); | 92 return command.Run(session, web_view, id, params, value); |
| 92 return Status(kUnknownError, "element identifier must be a string"); | 93 return Status(kUnknownError, "element identifier must be a string"); |
| 93 } | 94 } |
| 94 | 95 |
| 95 Status ExecuteFindChildElement( | 96 Status ExecuteFindChildElement( |
| 96 int interval_ms, | 97 int interval_ms, |
| 97 Session* session, | 98 Session* session, |
| 98 WebView* web_view, | 99 WebView* web_view, |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 WebView* web_view, | 545 WebView* web_view, |
| 545 const std::string& element_id, | 546 const std::string& element_id, |
| 546 const base::DictionaryValue& params, | 547 const base::DictionaryValue& params, |
| 547 scoped_ptr<base::Value>* value) { | 548 scoped_ptr<base::Value>* value) { |
| 548 std::string other_element_id; | 549 std::string other_element_id; |
| 549 if (!params.GetString("other", &other_element_id)) | 550 if (!params.GetString("other", &other_element_id)) |
| 550 return Status(kUnknownError, "'other' must be a string"); | 551 return Status(kUnknownError, "'other' must be a string"); |
| 551 value->reset(new base::FundamentalValue(element_id == other_element_id)); | 552 value->reset(new base::FundamentalValue(element_id == other_element_id)); |
| 552 return Status(kOk); | 553 return Status(kOk); |
| 553 } | 554 } |
| OLD | NEW |