summaryrefslogtreecommitdiffstats
path: root/content/browser/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/ssl')
-rw-r--r--content/browser/ssl/ssl_client_auth_handler.cc7
-rw-r--r--content/browser/ssl/ssl_manager.cc10
2 files changed, 9 insertions, 8 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 667e3ba..f4bfe3d 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -9,8 +9,8 @@
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "content/browser/ssl/ssl_client_auth_notification_details.h"
-#include "content/common/notification_service.h"
#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/notification_service.h"
#include "net/base/x509_certificate.h"
#include "net/url_request/url_request.h"
@@ -58,7 +58,8 @@ void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
SSLClientAuthNotificationDetails details(cert_request_info_, cert);
- NotificationService* service = NotificationService::current();
+ content::NotificationService* service =
+ content::NotificationService::current();
service->Notify(content::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
content::Source<SSLClientAuthHandler>(this),
content::Details<SSLClientAuthNotificationDetails>(&details));
@@ -141,7 +142,7 @@ void SSLClientAuthObserver::StartObserving() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
notification_registrar_.Add(
this, content::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
}
void SSLClientAuthObserver::StopObserving() {
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 19c0546..f4abf54 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -18,7 +18,7 @@
#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/provisional_load_details.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "net/base/cert_status_flags.h"
@@ -50,10 +50,10 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
// static
void SSLManager::NotifySSLInternalStateChanged(
NavigationController* controller) {
- NotificationService::current()->Notify(
+ content::NotificationService::current()->Notify(
content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
content::Source<content::BrowserContext>(controller->browser_context()),
- NotificationService::NoDetails());
+ content::NotificationService::NoDetails());
}
// static
@@ -250,9 +250,9 @@ void SSLManager::UpdateEntry(NavigationEntry* entry) {
policy()->UpdateEntry(entry, controller_->tab_contents());
if (!entry->ssl().Equals(original_ssl_status)) {
- NotificationService::current()->Notify(
+ content::NotificationService::current()->Notify(
content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
content::Source<NavigationController>(controller_),
- NotificationService::NoDetails());
+ content::NotificationService::NoDetails());
}
}