| 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/capabilities.h" | 5 #include "chrome/test/chromedriver/capabilities.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 if (iter == switch_map_.end()) | 529 if (iter == switch_map_.end()) |
| 530 break; | 530 break; |
| 531 str += " "; | 531 str += " "; |
| 532 } | 532 } |
| 533 return str; | 533 return str; |
| 534 } | 534 } |
| 535 | 535 |
| 536 PerfLoggingPrefs::PerfLoggingPrefs() | 536 PerfLoggingPrefs::PerfLoggingPrefs() |
| 537 : network(InspectorDomainStatus::kDefaultEnabled), | 537 : network(InspectorDomainStatus::kDefaultEnabled), |
| 538 page(InspectorDomainStatus::kDefaultEnabled), | 538 page(InspectorDomainStatus::kDefaultEnabled), |
| 539 timeline(InspectorDomainStatus::kDefaultEnabled), | 539 timeline(InspectorDomainStatus::kDefaultDisabled), |
| 540 trace_categories(), | 540 trace_categories(), |
| 541 buffer_usage_reporting_interval(1000) {} | 541 buffer_usage_reporting_interval(1000) {} |
| 542 | 542 |
| 543 PerfLoggingPrefs::~PerfLoggingPrefs() {} | 543 PerfLoggingPrefs::~PerfLoggingPrefs() {} |
| 544 | 544 |
| 545 Capabilities::Capabilities() | 545 Capabilities::Capabilities() |
| 546 : android_use_running_app(false), | 546 : android_use_running_app(false), |
| 547 detach(false), | 547 detach(false), |
| 548 force_devtools_screenshot(false) {} | 548 force_devtools_screenshot(false) {} |
| 549 | 549 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 579 if (iter == logging_prefs.end() || iter->second == Log::kOff) { | 579 if (iter == logging_prefs.end() || iter->second == Log::kOff) { |
| 580 const base::DictionaryValue* chrome_options = NULL; | 580 const base::DictionaryValue* chrome_options = NULL; |
| 581 if (desired_caps.GetDictionary("chromeOptions", &chrome_options) && | 581 if (desired_caps.GetDictionary("chromeOptions", &chrome_options) && |
| 582 chrome_options->HasKey("perfLoggingPrefs")) { | 582 chrome_options->HasKey("perfLoggingPrefs")) { |
| 583 return Status(kUnknownError, "perfLoggingPrefs specified, " | 583 return Status(kUnknownError, "perfLoggingPrefs specified, " |
| 584 "but performance logging was not enabled"); | 584 "but performance logging was not enabled"); |
| 585 } | 585 } |
| 586 } | 586 } |
| 587 return Status(kOk); | 587 return Status(kOk); |
| 588 } | 588 } |
| OLD | NEW |