| 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/browser/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 #include "net/proxy/proxy_config_service_fixed.h" | 62 #include "net/proxy/proxy_config_service_fixed.h" |
| 63 #include "net/proxy/proxy_script_fetcher_impl.h" | 63 #include "net/proxy/proxy_script_fetcher_impl.h" |
| 64 #include "net/proxy/proxy_service.h" | 64 #include "net/proxy/proxy_service.h" |
| 65 #include "net/url_request/data_protocol_handler.h" | 65 #include "net/url_request/data_protocol_handler.h" |
| 66 #include "net/url_request/file_protocol_handler.h" | 66 #include "net/url_request/file_protocol_handler.h" |
| 67 #include "net/url_request/ftp_protocol_handler.h" | 67 #include "net/url_request/ftp_protocol_handler.h" |
| 68 #include "net/url_request/url_request.h" | 68 #include "net/url_request/url_request.h" |
| 69 #include "net/url_request/url_request_job_factory_impl.h" | 69 #include "net/url_request/url_request_job_factory_impl.h" |
| 70 | 70 |
| 71 #if !defined(OS_ANDROID) | 71 #if !defined(OS_ANDROID) |
| 72 #include "chrome/browser/managed_mode.h" | 72 #include "chrome/browser/managed_mode/managed_mode.h" |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 #if defined(OS_CHROMEOS) | 75 #if defined(OS_CHROMEOS) |
| 76 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" | 76 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" |
| 77 #include "chrome/browser/chromeos/gview_request_interceptor.h" | 77 #include "chrome/browser/chromeos/gview_request_interceptor.h" |
| 78 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 78 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 79 #include "chrome/browser/chromeos/settings/cros_settings.h" | 79 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 80 #include "chrome/browser/chromeos/settings/cros_settings_names.h" | 80 #include "chrome/browser/chromeos/settings/cros_settings_names.h" |
| 81 #endif // defined(OS_CHROMEOS) | 81 #endif // defined(OS_CHROMEOS) |
| 82 | 82 |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 params->http_pipelining_enabled = globals->http_pipelining_enabled; | 705 params->http_pipelining_enabled = globals->http_pipelining_enabled; |
| 706 params->testing_fixed_http_port = globals->testing_fixed_http_port; | 706 params->testing_fixed_http_port = globals->testing_fixed_http_port; |
| 707 params->testing_fixed_https_port = globals->testing_fixed_https_port; | 707 params->testing_fixed_https_port = globals->testing_fixed_https_port; |
| 708 | 708 |
| 709 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 709 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 710 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { | 710 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { |
| 711 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( | 711 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( |
| 712 switches::kTrustedSpdyProxy); | 712 switches::kTrustedSpdyProxy); |
| 713 } | 713 } |
| 714 } | 714 } |
| OLD | NEW |