| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "headless/lib/browser/headless_browser_context_options.h" | 5 #include "headless/lib/browser/headless_browser_context_options.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 namespace headless { | 10 namespace headless { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 HeadlessBrowser::Options* options) | 35 HeadlessBrowser::Options* options) |
| 36 : browser_options_(options) {} | 36 : browser_options_(options) {} |
| 37 | 37 |
| 38 const std::string& HeadlessBrowserContextOptions::product_name_and_version() | 38 const std::string& HeadlessBrowserContextOptions::product_name_and_version() |
| 39 const { | 39 const { |
| 40 return ReturnOverriddenValue(product_name_and_version_, | 40 return ReturnOverriddenValue(product_name_and_version_, |
| 41 browser_options_->product_name_and_version); | 41 browser_options_->product_name_and_version); |
| 42 } | 42 } |
| 43 | 43 |
| 44 const std::string& HeadlessBrowserContextOptions::user_agent() const { | 44 const std::string& HeadlessBrowserContextOptions::user_agent() const { |
| 45 return ReturnOverriddenValue(user_agent_, browser_options_->user_agent); | 45 return browser_options_->user_agent; |
| 46 } | 46 } |
| 47 | 47 |
| 48 const net::HostPortPair& HeadlessBrowserContextOptions::proxy_server() const { | 48 const net::HostPortPair& HeadlessBrowserContextOptions::proxy_server() const { |
| 49 return ReturnOverriddenValue(proxy_server_, browser_options_->proxy_server); | 49 return ReturnOverriddenValue(proxy_server_, browser_options_->proxy_server); |
| 50 } | 50 } |
| 51 | 51 |
| 52 const std::string& HeadlessBrowserContextOptions::host_resolver_rules() const { | 52 const std::string& HeadlessBrowserContextOptions::host_resolver_rules() const { |
| 53 return ReturnOverriddenValue(host_resolver_rules_, | 53 return ReturnOverriddenValue(host_resolver_rules_, |
| 54 browser_options_->host_resolver_rules); | 54 browser_options_->host_resolver_rules); |
| 55 } | 55 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 77 const ProtocolHandlerMap& HeadlessBrowserContextOptions::protocol_handlers() | 77 const ProtocolHandlerMap& HeadlessBrowserContextOptions::protocol_handlers() |
| 78 const { | 78 const { |
| 79 return protocol_handlers_; | 79 return protocol_handlers_; |
| 80 } | 80 } |
| 81 | 81 |
| 82 ProtocolHandlerMap HeadlessBrowserContextOptions::TakeProtocolHandlers() { | 82 ProtocolHandlerMap HeadlessBrowserContextOptions::TakeProtocolHandlers() { |
| 83 return std::move(protocol_handlers_); | 83 return std::move(protocol_handlers_); |
| 84 } | 84 } |
| 85 | 85 |
| 86 } // namespace headless | 86 } // namespace headless |
| OLD | NEW |