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

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

Issue 7529043: Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_INFO_H_ 5 #ifndef NET_PROXY_PROXY_INFO_H_
6 #define NET_PROXY_PROXY_INFO_H_ 6 #define NET_PROXY_PROXY_INFO_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "net/base/net_api.h" 11 #include "net/base/net_export.h"
12 #include "net/proxy/proxy_config.h" 12 #include "net/proxy/proxy_config.h"
13 #include "net/proxy/proxy_list.h" 13 #include "net/proxy/proxy_list.h"
14 #include "net/proxy/proxy_retry_info.h" 14 #include "net/proxy/proxy_retry_info.h"
15 #include "net/proxy/proxy_server.h" 15 #include "net/proxy/proxy_server.h"
16 16
17 namespace net { 17 namespace net {
18 18
19 // This object holds proxy information returned by ResolveProxy. 19 // This object holds proxy information returned by ResolveProxy.
20 class NET_API ProxyInfo { 20 class NET_EXPORT ProxyInfo {
21 public: 21 public:
22 ProxyInfo(); 22 ProxyInfo();
23 ~ProxyInfo(); 23 ~ProxyInfo();
24 // Default copy-constructor and assignment operator are OK! 24 // Default copy-constructor and assignment operator are OK!
25 25
26 // Uses the same proxy server as the given |proxy_info|. 26 // Uses the same proxy server as the given |proxy_info|.
27 void Use(const ProxyInfo& proxy_info); 27 void Use(const ProxyInfo& proxy_info);
28 28
29 // Uses a direct connection. 29 // Uses a direct connection.
30 void UseDirect(); 30 void UseDirect();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // try. If proxy_list_ is empty, then there is nothing left to fall back to. 102 // try. If proxy_list_ is empty, then there is nothing left to fall back to.
103 ProxyList proxy_list_; 103 ProxyList proxy_list_;
104 104
105 // This value identifies the proxy config used to initialize this object. 105 // This value identifies the proxy config used to initialize this object.
106 ProxyConfig::ID config_id_; 106 ProxyConfig::ID config_id_;
107 }; 107 };
108 108
109 } // namespace net 109 } // namespace net
110 110
111 #endif // NET_PROXY_PROXY_INFO_H_ 111 #endif // NET_PROXY_PROXY_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698