diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
tree | a75584b11b8ef188b4eb3376b9146e063823a916 /content/browser/ssl/ssl_client_auth_handler.h | |
parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
download | chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2 |
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.
BUG=98716
TBR=joi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_client_auth_handler.h')
-rw-r--r-- | content/browser/ssl/ssl_client_auth_handler.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index 9905a68..3a6468a 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -10,8 +10,8 @@ #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 "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "net/base/ssl_cert_request_info.h" namespace net { @@ -77,7 +77,8 @@ class CONTENT_EXPORT SSLClientAuthHandler DISALLOW_COPY_AND_ASSIGN(SSLClientAuthHandler); }; -class CONTENT_EXPORT SSLClientAuthObserver : public NotificationObserver { +class CONTENT_EXPORT SSLClientAuthObserver + : public content::NotificationObserver { public: SSLClientAuthObserver(net::SSLCertRequestInfo* cert_request_info, SSLClientAuthHandler* handler); @@ -86,10 +87,10 @@ class CONTENT_EXPORT SSLClientAuthObserver : public NotificationObserver { // UI should implement this to close the dialog. virtual void OnCertSelectedByNotification() = 0; - // NotificationObserver implementation: + // content::NotificationObserver implementation: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Begins observing notifications from other SSLClientAuthHandler instances. // If another instance chooses a cert for a matching SSLCertRequestInfo, we @@ -106,7 +107,7 @@ class CONTENT_EXPORT SSLClientAuthObserver : public NotificationObserver { scoped_refptr<SSLClientAuthHandler> handler_; - NotificationRegistrar notification_registrar_; + content::NotificationRegistrar notification_registrar_; DISALLOW_COPY_AND_ASSIGN(SSLClientAuthObserver); }; |