net/proxy/proxy_config.h - Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/proxy/proxy_config.h

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and revert nss_ocsp.cc changes Created 7 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

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 #ifndef NET_PROXY_PROXY_CONFIG_H_	5 #ifndef NET_PROXY_PROXY_CONFIG_H_

6 #define NET_PROXY_PROXY_CONFIG_H_	6 #define NET_PROXY_PROXY_CONFIG_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "googleurl/src/gurl.h"

11 #include "net/base/net_export.h"	10 #include "net/base/net_export.h"

12 #include "net/proxy/proxy_bypass_rules.h"	11 #include "net/proxy/proxy_bypass_rules.h"

13 #include "net/proxy/proxy_config_source.h"	12 #include "net/proxy/proxy_config_source.h"

14 #include "net/proxy/proxy_list.h"	13 #include "net/proxy/proxy_list.h"

15 #include "net/proxy/proxy_server.h"	14 #include "net/proxy/proxy_server.h"

	15 #include "url/gurl.h"

16	16

17 namespace base {	17 namespace base {

18 class Value;	18 class Value;

19 }	19 }

20	20

21 namespace net {	21 namespace net {

22	22

23 class ProxyInfo;	23 class ProxyInfo;

24	24

25 // ProxyConfig describes a user's proxy settings.	25 // ProxyConfig describes a user's proxy settings.

(...skipping 228 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
254 ProxyConfigSource source_;	254 ProxyConfigSource source_;

255	255

256 ID id_;	256 ID id_;

257 };	257 };

258	258

259 } // namespace net	259 } // namespace net

260	260

261	261

262	262

263 #endif // NET_PROXY_PROXY_CONFIG_H_	263 #endif // NET_PROXY_PROXY_CONFIG_H_

OLD	NEW

« no previous file with comments | « net/proxy/proxy_bypass_rules.h ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »