summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 19:01:49 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 19:01:49 +0000
commiteb2b46a69de70649034060e0bb569f10fca5856a (patch)
tree4f87e02c0b3246ab4a18e34971f1282eeddebdff /net
parent72a9b30f46ce4b47a3d545fba1b6918fb5cd7b44 (diff)
downloadchromium_src-eb2b46a69de70649034060e0bb569f10fca5856a.zip
chromium_src-eb2b46a69de70649034060e0bb569f10fca5856a.tar.gz
chromium_src-eb2b46a69de70649034060e0bb569f10fca5856a.tar.bz2
net: Add NET_API to url_request.
BUG=76997 TEST=none Review URL: http://codereview.chromium.org/7033036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_alternate_protocols.h5
-rw-r--r--net/http/http_network_session.h8
-rw-r--r--net/http/http_transaction_factory.h3
-rw-r--r--net/url_request/url_request.h7
-rw-r--r--net/url_request/url_request_context.h5
-rw-r--r--net/url_request/url_request_context_storage.h3
-rw-r--r--net/url_request/url_request_job.h3
-rw-r--r--net/url_request/url_request_job_factory.h8
-rw-r--r--net/url_request/url_request_job_tracker.h5
-rw-r--r--net/url_request/url_request_test_job.h2
-rw-r--r--net/url_request/url_request_throttler_entry.h3
-rw-r--r--net/url_request/url_request_throttler_entry_interface.h3
-rw-r--r--net/url_request/url_request_throttler_manager.h4
-rw-r--r--net/url_request/view_cache_helper.h3
14 files changed, 39 insertions, 23 deletions
diff --git a/net/http/http_alternate_protocols.h b/net/http/http_alternate_protocols.h
index 10b1a06..3829044 100644
--- a/net/http/http_alternate_protocols.h
+++ b/net/http/http_alternate_protocols.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -16,10 +16,11 @@
#include "base/basictypes.h"
#include "net/base/host_port_pair.h"
+#include "net/base/net_api.h"
namespace net {
-class HttpAlternateProtocols {
+class NET_API HttpAlternateProtocols {
public:
enum Protocol {
NPN_SPDY_1,
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 1efc302..b92b033 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -11,6 +11,7 @@
#include "base/threading/non_thread_safe.h"
#include "net/base/host_port_pair.h"
#include "net/base/host_resolver.h"
+#include "net/base/net_api.h"
#include "net/base/ssl_client_auth_cache.h"
#include "net/http/http_alternate_protocols.h"
#include "net/http/http_auth_cache.h"
@@ -39,10 +40,11 @@ class SSLConfigService;
class SSLHostInfoFactory;
// This class holds session objects used by HttpNetworkTransaction objects.
-class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
- public base::NonThreadSafe {
+class NET_API HttpNetworkSession
+ : public base::RefCounted<HttpNetworkSession>,
+ NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
- struct Params {
+ struct NET_API Params {
Params()
: client_socket_factory(NULL),
host_resolver(NULL),
diff --git a/net/http/http_transaction_factory.h b/net/http/http_transaction_factory.h
index e457828..aef7e03 100644
--- a/net/http/http_transaction_factory.h
+++ b/net/http/http_transaction_factory.h
@@ -7,6 +7,7 @@
#pragma once
#include "base/memory/scoped_ptr.h"
+#include "net/base/net_api.h"
namespace net {
@@ -16,7 +17,7 @@ class HttpTransaction;
// An interface to a class that can create HttpTransaction objects.
-class HttpTransactionFactory {
+class NET_API HttpTransactionFactory {
public:
virtual ~HttpTransactionFactory() {}
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index c43aa45..f04cef2 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -19,6 +19,7 @@
#include "googleurl/src/gurl.h"
#include "net/base/completion_callback.h"
#include "net/base/load_states.h"
+#include "net/base/net_api.h"
#include "net/base/net_log.h"
#include "net/base/request_priority.h"
#include "net/http/http_request_headers.h"
@@ -58,7 +59,7 @@ typedef std::vector<std::string> ResponseCookies;
//
// NOTE: All usage of all instances of this class should be on the same thread.
//
-class URLRequest : public base::NonThreadSafe {
+class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
// Callback function implemented by protocol handlers to create new jobs.
// The factory may return NULL to indicate an error, which will cause other
@@ -85,7 +86,7 @@ class URLRequest : public base::NonThreadSafe {
// This class handles network interception. Use with
// (Un)RegisterRequestInterceptor.
- class Interceptor {
+ class NET_API Interceptor {
public:
virtual ~Interceptor() {}
@@ -137,7 +138,7 @@ class URLRequest : public base::NonThreadSafe {
// if an error occurred, or if the IO is just pending. When Read() returns
// true with zero bytes read, it indicates the end of the response.
//
- class Delegate {
+ class NET_API Delegate {
public:
virtual ~Delegate() {}
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 3ba4841..fca0ea5 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -13,6 +13,7 @@
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
+#include "net/base/net_api.h"
#include "net/base/net_log.h"
#include "net/base/ssl_config_service.h"
#include "net/base/transport_security_state.h"
@@ -38,9 +39,9 @@ class URLRequestJobFactory;
// instances. Note that URLRequestContext typically does not provide storage for
// these member variables, since they may be shared. For the ones that aren't
// shared, URLRequestContextStorage can be helpful in defining their storage.
-class URLRequestContext
+class NET_API URLRequestContext
: public base::RefCountedThreadSafe<URLRequestContext>,
- public base::NonThreadSafe {
+ NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
URLRequestContext();
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 4cdfc43..e7d9148 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "net/base/net_api.h"
namespace net {
@@ -30,7 +31,7 @@ class URLRequestJobFactory;
// URLRequestContextStorage is a helper class that provides storage for unowned
// member variables of URLRequestContext.
-class URLRequestContextStorage {
+class NET_API URLRequestContextStorage {
public:
// Note that URLRequestContextStorage does not acquire a reference to
// URLRequestContext, since it is often designed to be embedded in a
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 7968fbc..d4330c2 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -18,6 +18,7 @@
#include "net/base/filter.h"
#include "net/base/host_port_pair.h"
#include "net/base/load_states.h"
+#include "net/base/net_api.h"
namespace net {
@@ -30,7 +31,7 @@ class UploadData;
class URLRequestStatus;
class X509Certificate;
-class URLRequestJob : public base::RefCounted<URLRequestJob> {
+class NET_API URLRequestJob : public base::RefCounted<URLRequestJob> {
public:
explicit URLRequestJob(URLRequest* request);
diff --git a/net/url_request/url_request_job_factory.h b/net/url_request/url_request_job_factory.h
index 594883a..8f67ed4 100644
--- a/net/url_request/url_request_job_factory.h
+++ b/net/url_request/url_request_job_factory.h
@@ -11,6 +11,7 @@
#include <vector>
#include "base/basictypes.h"
#include "base/threading/non_thread_safe.h"
+#include "net/base/net_api.h"
class GURL;
@@ -19,16 +20,17 @@ namespace net {
class URLRequest;
class URLRequestJob;
-class URLRequestJobFactory : public base::NonThreadSafe {
+class NET_TEST URLRequestJobFactory
+ : NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
- class ProtocolHandler {
+ class NET_TEST ProtocolHandler {
public:
virtual ~ProtocolHandler();
virtual URLRequestJob* MaybeCreateJob(URLRequest* request) const = 0;
};
- class Interceptor {
+ class NET_TEST Interceptor {
public:
virtual ~Interceptor();
diff --git a/net/url_request/url_request_job_tracker.h b/net/url_request/url_request_job_tracker.h
index d558939..cb691ce 100644
--- a/net/url_request/url_request_job_tracker.h
+++ b/net/url_request/url_request_job_tracker.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/observer_list.h"
+#include "net/base/net_api.h"
#include "net/url_request/url_request_status.h"
class GURL;
@@ -24,7 +25,7 @@ class URLRequestJob;
// onthe same thread where all of the application's URLRequest calls are
// made.
//
-class URLRequestJobTracker {
+class NET_API URLRequestJobTracker {
public:
typedef std::vector<URLRequestJob*> JobList;
typedef JobList::const_iterator JobIterator;
@@ -97,7 +98,7 @@ class URLRequestJobTracker {
JobList active_jobs_;
};
-extern URLRequestJobTracker g_url_request_job_tracker;
+NET_API extern URLRequestJobTracker g_url_request_job_tracker;
} // namespace net
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index 59296ab..19210b1 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -36,7 +36,7 @@ namespace net {
//
// Optionally, you can also construct test jobs that advance automatically
// without having to call ProcessOnePendingMessage.
-class URLRequestTestJob : public URLRequestJob {
+class NET_TEST URLRequestTestJob : public URLRequestJob {
public:
// Constructs a job to return one of the canned responses depending on the
// request url, with auto advance disabled.
diff --git a/net/url_request/url_request_throttler_entry.h b/net/url_request/url_request_throttler_entry.h
index 88ceb08..7cc4133 100644
--- a/net/url_request/url_request_throttler_entry.h
+++ b/net/url_request/url_request_throttler_entry.h
@@ -28,7 +28,8 @@ class URLRequestThrottlerManager;
// destination and provide guidance (to the application level only) on whether
// too many requests have been sent and when a good time to send the next one
// would be. This is never used to deny requests at the network level.
-class URLRequestThrottlerEntry : public URLRequestThrottlerEntryInterface {
+class NET_API URLRequestThrottlerEntry
+ : public URLRequestThrottlerEntryInterface {
public:
// Sliding window period.
static const int kDefaultSlidingWindowPeriodMs;
diff --git a/net/url_request/url_request_throttler_entry_interface.h b/net/url_request/url_request_throttler_entry_interface.h
index 2b56506..259c5cf 100644
--- a/net/url_request/url_request_throttler_entry_interface.h
+++ b/net/url_request/url_request_throttler_entry_interface.h
@@ -9,13 +9,14 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/time.h"
+#include "net/base/net_api.h"
namespace net {
class URLRequestThrottlerHeaderInterface;
// Interface provided on entries of the URL request throttler manager.
-class URLRequestThrottlerEntryInterface
+class NET_API URLRequestThrottlerEntryInterface
: public base::RefCountedThreadSafe<URLRequestThrottlerEntryInterface> {
public:
URLRequestThrottlerEntryInterface() {}
diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h
index cae4020..4b9b21f 100644
--- a/net/url_request/url_request_throttler_manager.h
+++ b/net/url_request/url_request_throttler_manager.h
@@ -15,6 +15,7 @@
#include "base/memory/singleton.h"
#include "base/threading/non_thread_safe.h"
#include "googleurl/src/gurl.h"
+#include "net/base/net_api.h"
#include "net/url_request/url_request_throttler_entry.h"
namespace net {
@@ -32,7 +33,8 @@ namespace net {
// NOTE: All usage of this singleton object must be on the same thread,
// although to allow it to be used as a singleton, construction and destruction
// can occur on a separate thread.
-class URLRequestThrottlerManager : public base::NonThreadSafe {
+class NET_API URLRequestThrottlerManager
+ : NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
static URLRequestThrottlerManager* GetInstance();
diff --git a/net/url_request/view_cache_helper.h b/net/url_request/view_cache_helper.h
index 4297a00..ff9d937 100644
--- a/net/url_request/view_cache_helper.h
+++ b/net/url_request/view_cache_helper.h
@@ -10,6 +10,7 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
+#include "net/base/net_api.h"
namespace disk_cache {
class Backend;
@@ -20,7 +21,7 @@ namespace net {
class URLRequestContext;
-class ViewCacheHelper {
+class NET_API ViewCacheHelper {
public:
ViewCacheHelper();
~ViewCacheHelper();
generated by cgit v1.1 at 2025-03-05 19:00:37 +0000