| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/webdriver/commands/webdriver_command.h" | 5 #include "chrome/test/webdriver/commands/webdriver_command.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/singleton.h" | 10 #include "base/singleton.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "base/json/json_reader.h" | 13 #include "base/json/json_reader.h" |
| 14 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "chrome/common/chrome_constants.h" | 16 #include "chrome/common/chrome_constants.h" |
| 17 #include "chrome/test/automation/automation_proxy.h" | 17 #include "chrome/test/automation/automation_proxy.h" |
| 18 #include "chrome/test/automation/browser_proxy.h" | 18 #include "chrome/test/automation/browser_proxy.h" |
| 19 #include "chrome/test/automation/tab_proxy.h" | 19 #include "chrome/test/automation/tab_proxy.h" |
| 20 #include "chrome/test/automation/window_proxy.h" | 20 #include "chrome/test/automation/window_proxy.h" |
| 21 #include "chrome/test/webdriver/session_manager.h" |
| 21 #include "chrome/test/webdriver/utility_functions.h" | 22 #include "chrome/test/webdriver/utility_functions.h" |
| 22 | 23 |
| 23 namespace webdriver { | 24 namespace webdriver { |
| 24 | 25 |
| 25 const std::string WebDriverCommand::kElementDictionaryKey = "ELEMENT"; | 26 const std::string WebDriverCommand::kElementDictionaryKey = "ELEMENT"; |
| 26 | 27 |
| 27 bool WebDriverCommand::IsElementIdDictionary( | 28 bool WebDriverCommand::IsElementIdDictionary( |
| 28 const DictionaryValue* const dictionary) { | 29 const DictionaryValue* const dictionary) { |
| 29 // Test that it has the element key and that it is a string. | 30 // Test that it has the element key and that it is a string. |
| 30 Value* element_id; | 31 Value* element_id; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 55 "Session not found: " + session_id)); | 56 "Session not found: " + session_id)); |
| 56 response->set_status(kSessionNotFound); | 57 response->set_status(kSessionNotFound); |
| 57 return false; | 58 return false; |
| 58 } | 59 } |
| 59 | 60 |
| 60 response->SetField("sessionId", Value::CreateStringValue(session_id)); | 61 response->SetField("sessionId", Value::CreateStringValue(session_id)); |
| 61 return true; | 62 return true; |
| 62 } | 63 } |
| 63 | 64 |
| 64 } // namespace webdriver | 65 } // namespace webdriver |
| OLD | NEW |