diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 15:52:26 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 15:52:26 +0000 |
| commit | 172da1b80ab1d9ec5428f04919f1bed13a37e3dc (patch) | |
| tree | 4ee0eaf3d734a20b208de30616123ad7621abf5a /net/proxy/proxy_service.h | |
| parent | 8b615de52644092891367b304f3b4663cc6daba6 (diff) | |
| download | chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.zip chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.gz chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.bz2 | |
Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.
Review URL: http://codereview.chromium.org/7529043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 3303480..ad73b39 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -14,7 +14,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/base/network_change_notifier.h" #include "net/proxy/proxy_config_service.h" @@ -37,9 +37,9 @@ class URLRequestContext; // This class can be used to resolve the proxy server to use when loading a // HTTP(S) URL. It uses the given ProxyResolver to handle the actual proxy // resolution. See ProxyResolverV8 for example. -class NET_API ProxyService : public NetworkChangeNotifier::IPAddressObserver, - public ProxyConfigService::Observer, - NON_EXPORTED_BASE(public base::NonThreadSafe) { +class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, + public ProxyConfigService::Observer, + NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // The instance takes ownership of |config_service| and |resolver|. // |net_log| is a possibly NULL destination to send log events to. It must @@ -362,7 +362,7 @@ class NET_API ProxyService : public NetworkChangeNotifier::IPAddressObserver, }; // Wrapper for invoking methods on a ProxyService synchronously. -class NET_API SyncProxyServiceHelper +class NET_EXPORT SyncProxyServiceHelper : public base::RefCountedThreadSafe<SyncProxyServiceHelper> { public: SyncProxyServiceHelper(MessageLoop* io_message_loop, |