| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_executor_impl.h" | 5 #include "chrome/test/chromedriver/command_executor_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
| 11 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
| 12 #include "base/sys_info.h" | 12 #include "base/sys_info.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/test/chromedriver/alert_commands.h" |
| 14 #include "chrome/test/chromedriver/chrome/status.h" | 15 #include "chrome/test/chromedriver/chrome/status.h" |
| 15 #include "chrome/test/chromedriver/chrome/version.h" | 16 #include "chrome/test/chromedriver/chrome/version.h" |
| 16 #include "chrome/test/chromedriver/command_names.h" | 17 #include "chrome/test/chromedriver/command_names.h" |
| 17 #include "chrome/test/chromedriver/commands.h" | 18 #include "chrome/test/chromedriver/commands.h" |
| 18 #include "chrome/test/chromedriver/element_commands.h" | 19 #include "chrome/test/chromedriver/element_commands.h" |
| 19 #include "chrome/test/chromedriver/net/url_request_context_getter.h" | 20 #include "chrome/test/chromedriver/net/url_request_context_getter.h" |
| 20 #include "chrome/test/chromedriver/session.h" | 21 #include "chrome/test/chromedriver/session.h" |
| 21 #include "chrome/test/chromedriver/session_commands.h" | 22 #include "chrome/test/chromedriver/session_commands.h" |
| 22 #include "chrome/test/chromedriver/session_map.h" | 23 #include "chrome/test/chromedriver/session_map.h" |
| 23 #include "chrome/test/chromedriver/window_commands.h" | 24 #include "chrome/test/chromedriver/window_commands.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 base::SysInfo::OperatingSystemName().c_str(), | 292 base::SysInfo::OperatingSystemName().c_str(), |
| 292 base::SysInfo::OperatingSystemVersion().c_str(), | 293 base::SysInfo::OperatingSystemVersion().c_str(), |
| 293 base::SysInfo::OperatingSystemArchitecture().c_str())); | 294 base::SysInfo::OperatingSystemArchitecture().c_str())); |
| 294 scoped_ptr<base::DictionaryValue> error(new base::DictionaryValue()); | 295 scoped_ptr<base::DictionaryValue> error(new base::DictionaryValue()); |
| 295 error->SetString("message", status.message()); | 296 error->SetString("message", status.message()); |
| 296 value->reset(error.release()); | 297 value->reset(error.release()); |
| 297 } | 298 } |
| 298 if (!*value) | 299 if (!*value) |
| 299 value->reset(base::Value::CreateNullValue()); | 300 value->reset(base::Value::CreateNullValue()); |
| 300 } | 301 } |
| OLD | NEW |