summaryrefslogtreecommitdiffstats
path: root/content/browser/ssl
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 22:11:57 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 22:11:57 +0000
commit8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c (patch)
tree6d15da0c38831ea9180d3d90caa66d5adc7cb000 /content/browser/ssl
parent8ea5d4bd1f750572bec6b6b73732bba147f0be42 (diff)
downloadchromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.zip
chromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.tar.gz
chromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.tar.bz2
Annotate all of the functions in content that need to be exported, in preparation for creating a content shared library.
R=darin@chromium.org, jam@chromium.org, willchan@chromium.org BUG=90442 TEST=everything still compiles Review URL: http://codereview.chromium.org/7800015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
-rw-r--r--content/browser/ssl/ssl_client_auth_handler.h7
-rw-r--r--content/browser/ssl/ssl_error_handler.h3
-rw-r--r--content/browser/ssl/ssl_host_state.h7
-rw-r--r--content/browser/ssl/ssl_manager.h13
4 files changed, 19 insertions, 11 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index 4657c84..9905a68 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "content/browser/browser_thread.h"
+#include "content/common/content_export.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
#include "net/base/ssl_cert_request_info.h"
@@ -22,7 +23,7 @@ class X509Certificate;
// authentication by the user.
// It is self-owned and deletes itself when the UI reports the user selection or
// when the net::URLRequest is cancelled.
-class SSLClientAuthHandler
+class CONTENT_EXPORT SSLClientAuthHandler
: public base::RefCountedThreadSafe<SSLClientAuthHandler,
BrowserThread::DeleteOnIOThread> {
public:
@@ -54,6 +55,8 @@ class SSLClientAuthHandler
virtual ~SSLClientAuthHandler();
private:
+ friend class base::RefCountedThreadSafe<SSLClientAuthHandler,
+ BrowserThread::DeleteOnIOThread>;
friend class BrowserThread;
friend class DeleteTask<SSLClientAuthHandler>;
@@ -74,7 +77,7 @@ class SSLClientAuthHandler
DISALLOW_COPY_AND_ASSIGN(SSLClientAuthHandler);
};
-class SSLClientAuthObserver : public NotificationObserver {
+class CONTENT_EXPORT SSLClientAuthObserver : public NotificationObserver {
public:
SSLClientAuthObserver(net::SSLCertRequestInfo* cert_request_info,
SSLClientAuthHandler* handler);
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h
index b0084d3..d5a360a 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/content/browser/ssl/ssl_error_handler.h
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "content/browser/renderer_host/global_request_id.h"
#include "content/browser/ssl/ssl_manager.h"
+#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
#include "webkit/glue/resource_type.h"
@@ -55,7 +56,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
// Cancels the associated net::URLRequest.
// This method can be called from OnDispatchFailed and OnDispatched.
- void CancelRequest();
+ CONTENT_EXPORT void CancelRequest();
// Continue the net::URLRequest ignoring any previous errors. Note that some
// errors cannot be ignored, in which case this will result in the request
diff --git a/content/browser/ssl/ssl_host_state.h b/content/browser/ssl/ssl_host_state.h
index 943f44e..7bceaa7 100644
--- a/content/browser/ssl/ssl_host_state.h
+++ b/content/browser/ssl/ssl_host_state.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.
@@ -10,8 +10,10 @@
#include <map>
#include <set>
+#include "base/compiler_specific.h"
#include "base/basictypes.h"
#include "base/threading/non_thread_safe.h"
+#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
#include "net/base/x509_certificate.h"
@@ -23,7 +25,8 @@
// from the SSLManager because this state is shared across many navigation
// controllers.
-class SSLHostState : public base::NonThreadSafe {
+class CONTENT_EXPORT SSLHostState
+ : NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
SSLHostState();
~SSLHostState();
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 07e3a57..1e59e7b 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/ssl/ssl_policy_backend.h"
+#include "content/common/content_export.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
#include "googleurl/src/gurl.h"
@@ -59,11 +60,11 @@ class SSLManager : public NotificationObserver {
int cert_status,
int security_bits,
int connection_status);
- static bool DeserializeSecurityInfo(const std::string& state,
- int* cert_id,
- int* cert_status,
- int* security_bits,
- int* connection_status);
+ CONTENT_EXPORT static bool DeserializeSecurityInfo(const std::string& state,
+ int* cert_id,
+ int* cert_status,
+ int* security_bits,
+ int* connection_status);
// Construct an SSLManager for the specified tab.
// If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
@@ -86,7 +87,7 @@ class SSLManager : public NotificationObserver {
void DidRunInsecureContent(const std::string& security_origin);
// Called to determine if there were any processed SSL errors from request.
- bool ProcessedSSLErrorFromRequest() const;
+ CONTENT_EXPORT bool ProcessedSSLErrorFromRequest() const;
// Entry point for navigation. This function begins the process of updating
// the security UI when the main frame navigates to a new URL.