Revert "content: convert SSL notifications to observer usage"

chrome/browser/ui/browser.cc

 // Copyright 2012 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.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 356 matching lines @@
   if (!app_name_.empty())
     chrome::RegisterAppPrefs(app_name_, profile_);
   tab_strip_model_->AddObserver(this);
 
   toolbar_model_.reset(new ToolbarModelImpl(toolbar_model_delegate_.get()));
   search_model_.reset(new chrome::search::SearchModel(NULL));
   search_delegate_.reset(
       new chrome::search::SearchDelegate(search_model_.get(),
                                          toolbar_model_.get()));
 
+  registrar_.Add(this, content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
+                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
 #if defined(ENABLE_THEMES)
   registrar_.Add(
@@ skipping 358 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, Tab adding/showing functions:
 
 void Browser::WindowFullscreenStateChanged() {
   fullscreen_controller_->WindowFullscreenStateChanged();
   command_controller_->FullscreenStateChanged();
   UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
 }
 
-void Browser::VisibleSSLStateChanged(content::WebContents* web_contents) {
-  // When the current tab's SSL state changes, we need to update the URL
-  // bar to reflect the new state.
-  DCHECK(web_contents);
-  if (tab_strip_model_->GetActiveWebContents() == web_contents)
-    UpdateToolbar(false);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted browser commands:
 
 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) {
   fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url);
 }
 
 bool Browser::SupportsWindowFeature(WindowFeature feature) const {
   return SupportsWindowFeatureImpl(feature, true);
 }
@@ skipping 982 matching lines @@
       false));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, content::NotificationObserver implementation:
 
 void Browser::Observe(int type,
                       const content::NotificationSource& source,
                       const content::NotificationDetails& details) {
   switch (type) {
+    case content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED:
+      // When the current tab's SSL state changes, we need to update the URL
+      // bar to reflect the new state. Note that it's possible for the selected
+      // tab contents to be NULL. This is because we listen for all sources
+      // (NavigationControllers) for convenience, so the notification could
+      // actually be for a different window while we're doing asynchronous
+      // closing of this one.
+      if (tab_strip_model_->GetActiveWebContents() &&
+          &tab_strip_model_->GetActiveWebContents()->GetController() ==
+          content::Source<NavigationController>(source).ptr())
+        UpdateToolbar(false);
+      break;
+
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       if (window()->GetLocationBar())
         window()->GetLocationBar()->UpdatePageActions();
 
       // Close any tabs from the unloaded extension, unless it's terminated,
       // in which case let the sad tabs remain.
       if (content::Details<extensions::UnloadedExtensionInfo>(
             details)->reason != extension_misc::UNLOAD_REASON_TERMINATE) {
         const Extension* extension =
             content::Details<extensions::UnloadedExtensionInfo>(
@@ skipping 496 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }