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

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

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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>
8
7 #include <string> 9 #include <string>
8 10
9 #include "base/command_line.h" 11 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
11 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
12 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "build/build_config.h"
13 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/io_thread.h" 17 #include "chrome/browser/io_thread.h"
15 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
16 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 19 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
17 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
18 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
19 #include "net/log/net_log.h" 22 #include "net/log/net_log.h"
20 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" 23 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
21 #include "net/proxy/proxy_config_service.h" 24 #include "net/proxy/proxy_config_service.h"
22 #include "net/proxy/proxy_script_fetcher_impl.h" 25 #include "net/proxy/proxy_script_fetcher_impl.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 #endif // defined(OS_IOS) 194 #endif // defined(OS_IOS)
192 } else { 195 } else {
193 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( 196 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
194 proxy_config_service.Pass(), num_pac_threads, net_log); 197 proxy_config_service.Pass(), num_pac_threads, net_log);
195 } 198 }
196 199
197 proxy_service->set_quick_check_enabled(quick_check_enabled); 200 proxy_service->set_quick_check_enabled(quick_check_enabled);
198 201
199 return proxy_service; 202 return proxy_service;
200 } 203 }
OLDNEW
« no previous file with comments | « chrome/browser/net/proxy_service_factory.h ('k') | chrome/browser/net/quota_policy_channel_id_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698