Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4198)

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/ssl/ssl_manager.h ('k') | content/browser/tab_contents/interstitial_page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/ssl/ssl_manager.cc
===================================================================
--- content/browser/ssl/ssl_manager.cc (revision 91968)
+++ content/browser/ssl/ssl_manager.cc (working copy)
@@ -47,7 +47,7 @@
// static
void SSLManager::NotifySSLInternalStateChanged() {
NotificationService::current()->Notify(
- NotificationType::SSL_INTERNAL_STATE_CHANGED,
+ content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
NotificationService::AllSources(),
NotificationService::NoDetails());
}
@@ -97,15 +97,15 @@
DCHECK(controller_);
// Subscribe to various notifications.
- registrar_.Add(this, NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR,
+ registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
Source<NavigationController>(controller_));
- registrar_.Add(this, NotificationType::RESOURCE_RESPONSE_STARTED,
+ registrar_.Add(this, content::NOTIFICATION_RESOURCE_RESPONSE_STARTED,
Source<RenderViewHostDelegate>(controller_->tab_contents()));
- registrar_.Add(this, NotificationType::RESOURCE_RECEIVED_REDIRECT,
+ registrar_.Add(this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
Source<RenderViewHostDelegate>(controller_->tab_contents()));
- registrar_.Add(this, NotificationType::LOAD_FROM_MEMORY_CACHE,
+ registrar_.Add(this, content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
Source<NavigationController>(controller_));
- registrar_.Add(this, NotificationType::SSL_INTERNAL_STATE_CHANGED,
+ registrar_.Add(this, content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
NotificationService::AllSources());
}
@@ -158,26 +158,26 @@
return net::IsCertStatusError(entry->ssl().cert_status());
}
-void SSLManager::Observe(NotificationType type,
+void SSLManager::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
// Dispatch by type.
- switch (type.value) {
- case NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR:
+ switch (type) {
+ case content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR:
// Do nothing.
break;
- case NotificationType::RESOURCE_RESPONSE_STARTED:
+ case content::NOTIFICATION_RESOURCE_RESPONSE_STARTED:
DidStartResourceResponse(Details<ResourceRequestDetails>(details).ptr());
break;
- case NotificationType::RESOURCE_RECEIVED_REDIRECT:
+ case content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT:
DidReceiveResourceRedirect(
Details<ResourceRedirectDetails>(details).ptr());
break;
- case NotificationType::LOAD_FROM_MEMORY_CACHE:
+ case content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE:
DidLoadFromMemoryCache(
Details<LoadFromMemoryCacheDetails>(details).ptr());
break;
- case NotificationType::SSL_INTERNAL_STATE_CHANGED:
+ case content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED:
DidChangeSSLInternalState();
break;
default:
@@ -240,7 +240,7 @@
if (!entry->ssl().Equals(original_ssl_status)) {
NotificationService::current()->Notify(
- NotificationType::SSL_VISIBLE_STATE_CHANGED,
+ content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
Source<NavigationController>(controller_),
NotificationService::NoDetails());
}
« no previous file with comments | « content/browser/ssl/ssl_manager.h ('k') | content/browser/tab_contents/interstitial_page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698