chrome/browser/net/chrome_url_request_context.cc - Issue 2866026: Rename Dns prefetching files to Predictor files...

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

Issue 2866026: Rename Dns prefetching files to Predictor files... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/connect_interceptor.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/chrome_url_request_context.h"	5 #include "chrome/browser/net/chrome_url_request_context.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

9 #include "base/message_loop_proxy.h"	9 #include "base/message_loop_proxy.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "chrome/browser/browser_process.h"	11 #include "chrome/browser/browser_process.h"

12 #include "chrome/browser/chrome_thread.h"	12 #include "chrome/browser/chrome_thread.h"

13 #include "chrome/browser/extensions/extensions_service.h"	13 #include "chrome/browser/extensions/extensions_service.h"

14 #include "chrome/browser/extensions/user_script_master.h"	14 #include "chrome/browser/extensions/user_script_master.h"

15 #include "chrome/browser/io_thread.h"	15 #include "chrome/browser/io_thread.h"

16 #include "chrome/browser/net/chrome_cookie_notification_details.h"	16 #include "chrome/browser/net/chrome_cookie_notification_details.h"

17 #include "chrome/browser/net/chrome_net_log.h"	17 #include "chrome/browser/net/chrome_net_log.h"

18 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"	18 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"

19 #include "chrome/browser/net/dns_global.h"	19 #include "chrome/browser/net/predictor_api.h"

20 #include "chrome/browser/privacy_blacklist/blacklist.h"	20 #include "chrome/browser/privacy_blacklist/blacklist.h"

21 #include "chrome/browser/privacy_blacklist/blacklist_request_info.h"	21 #include "chrome/browser/privacy_blacklist/blacklist_request_info.h"

22 #include "chrome/browser/profile.h"	22 #include "chrome/browser/profile.h"

23 #include "chrome/common/chrome_constants.h"	23 #include "chrome/common/chrome_constants.h"

24 #include "chrome/common/chrome_switches.h"	24 #include "chrome/common/chrome_switches.h"

25 #include "chrome/common/extensions/extension.h"	25 #include "chrome/common/extensions/extension.h"

26 #include "chrome/common/notification_service.h"	26 #include "chrome/common/notification_service.h"

27 #include "chrome/common/pref_names.h"	27 #include "chrome/common/pref_names.h"

28 #include "chrome/common/url_constants.h"	28 #include "chrome/common/url_constants.h"

29 #include "net/base/static_cookie_policy.h"	29 #include "net/base/static_cookie_policy.h"

(...skipping 1037 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1067	1067

1068 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {	1068 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {

1069 std::wstring proxy_bypass =	1069 std::wstring proxy_bypass =

1070 pref_service->GetString(prefs::kProxyBypassList);	1070 pref_service->GetString(prefs::kProxyBypassList);

1071 proxy_config->proxy_rules().bypass_rules.ParseFromString(	1071 proxy_config->proxy_rules().bypass_rules.ParseFromString(

1072 WideToASCII(proxy_bypass));	1072 WideToASCII(proxy_bypass));

1073 }	1073 }

1074	1074

1075 return proxy_config;	1075 return proxy_config;

1076 }	1076 }

OLD	NEW