Delete the provisional load commit notification since it duplicates the nav entry committed notification.

I had to add some more stuff to the nav entry committed structure which now looks suspiciously like the provisional load details structure. I'll see how I can improve this in a future pass.

I used the new NotificationRegistrar to automatically unregister for notifications in the SSL manager, which reduces some code.
Review URL: http://codereview.chromium.org/3095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2313 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/ssl_manager.h b/chrome/browser/ssl_manager.h
index 5d088a7..f0409b7 100644
--- a/chrome/browser/ssl_manager.h
+++ b/chrome/browser/ssl_manager.h
@@ -11,10 +11,11 @@
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/views/info_bar_message_view.h"
 #include "chrome/browser/provisional_load_details.h"
 #include "chrome/browser/resource_dispatcher_host.h"
 #include "chrome/browser/security_style.h"
+#include "chrome/browser/views/info_bar_message_view.h"
+#include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
@@ -25,10 +26,10 @@
 #include "webkit/glue/resource_type.h"
 
 class InfoBarItemView;
-class NavigationController;
 class NavigationEntry;
 class LoadFromMemoryCacheDetails;
 class LoadNotificationDetails;
+class NavigationController;
 class PrefService;
 class ResourceRedirectDetails;
 class ResourceRequestDetails;
@@ -422,9 +423,12 @@ class SSLManager : public NotificationObserver {
      Task* action;
    };
 
-  // Entry points for notifications to which we subscribe.
+  // Entry points for notifications to which we subscribe. Note that
+  // DidCommitProvisionalLoad uses the abstract NotificationDetails type since
+  // the type we need is in NavigationController which would create a circular
+  // header file dependency.
   void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details);
-  void DidCommitProvisionalLoad(ProvisionalLoadDetails* details);
+  void DidCommitProvisionalLoad(const NotificationDetails& details);
   void DidFailProvisionalLoadWithError(ProvisionalLoadDetails* details);
   void DidStartResourceResponse(ResourceRequestDetails* details);
   void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
@@ -449,6 +453,9 @@ class SSLManager : public NotificationObserver {
   // The list of currently visible SSL InfoBars.
   ObserverList<SSLInfoBar> visible_info_bars_;
 
+  // Handles registering notifications with the NotificationService.
+  NotificationRegistrar registrar_;
+
   // Certificate policies for each host.
   std::map<std::string, net::X509Certificate::Policy> cert_policy_for_host_;