Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Side by Side Diff: chrome/browser/net/proxy_service_factory.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/net/proxy_service_factory.h" 5 #include "chrome/browser/net/proxy_service_factory.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/io_thread.h" 17 #include "chrome/browser/io_thread.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 19 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "net/log/net_log.h"
23 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" 22 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
24 #include "net/proxy/proxy_config_service.h" 23 #include "net/proxy/proxy_config_service.h"
25 #include "net/proxy/proxy_resolver_v8.h" 24 #include "net/proxy/proxy_resolver_v8.h"
26 #include "net/proxy/proxy_script_fetcher_impl.h" 25 #include "net/proxy/proxy_script_fetcher_impl.h"
27 #include "net/proxy/proxy_service.h" 26 #include "net/proxy/proxy_service.h"
28 #include "net/proxy/proxy_service_v8.h" 27 #include "net/proxy/proxy_service_v8.h"
29 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
30 29
31 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
32 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 31 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 186 }
188 187
189 proxy_service->set_quick_check_enabled(quick_check_enabled); 188 proxy_service->set_quick_check_enabled(quick_check_enabled);
190 proxy_service->set_sanitize_url_policy( 189 proxy_service->set_sanitize_url_policy(
191 pac_https_url_stripping_enabled 190 pac_https_url_stripping_enabled
192 ? net::ProxyService::SanitizeUrlPolicy::SAFE 191 ? net::ProxyService::SanitizeUrlPolicy::SAFE
193 : net::ProxyService::SanitizeUrlPolicy::UNSAFE); 192 : net::ProxyService::SanitizeUrlPolicy::UNSAFE);
194 193
195 return proxy_service; 194 return proxy_service;
196 } 195 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698