Fix our handling of mixed SSL / non-SSL content....

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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/browser.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 164 matching lines @@
       toolbar_model_(this),
       chrome_updater_factory_(this),
       is_attempting_to_close_browser_(false),
       maximized_state_(MAXIMIZED_STATE_DEFAULT),
       method_factory_(this),
       idle_task_(new BrowserIdleTimer) {
   tabstrip_model_.AddObserver(this);
 
   NotificationService::current()->AddObserver(
       this,
-      NotificationType::SSL_STATE_CHANGED,
+      NotificationType::SSL_VISIBLE_STATE_CHANGED,
       NotificationService::AllSources());
 
   InitCommandState();
   BrowserList::AddBrowser(this);
 
   encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
                              profile_->GetPrefs(), NULL);
 
   // Trim browser memory on idle for low & medium memory models.
   if (g_browser_process->memory_model() < BrowserProcess::HIGH_MEMORY_MODEL)
@@ skipping 24 matching lines @@
   SessionService* session_service = profile_->GetSessionService();
   if (session_service)
     session_service->WindowClosed(session_id_);
 
   TabRestoreService* tab_restore_service = profile()->GetTabRestoreService();
   if (tab_restore_service)
     tab_restore_service->BrowserClosed(this);
 
   NotificationService::current()->RemoveObserver(
       this,
-      NotificationType::SSL_STATE_CHANGED,
+      NotificationType::SSL_VISIBLE_STATE_CHANGED,
       NotificationService::AllSources());
 
   if (profile_->IsOffTheRecord() &&
       !BrowserList::IsOffTheRecordSessionActive()) {
     // We reuse the OTR cookie store across OTR windows.  If the last OTR
     // window is closed, then we want to wipe the cookie store clean, so when
     // an OTR window is open again, it starts with an empty cookie store.  This
     // also frees up the memory that the OTR cookies were using.  OTR never
     // loads or writes persistent cookies (there is no backing store), so we
     // can just delete all of the cookies in the store.
@@ skipping 1671 matching lines @@
     case NotificationType::WEB_CONTENTS_DISCONNECTED:
       if (is_attempting_to_close_browser_) {
         // Need to do this asynchronously as it will close the tab, which is
         // currently on the call stack above us.
         MessageLoop::current()->PostTask(FROM_HERE,
             method_factory_.NewRunnableMethod(&Browser::ClearUnloadState,
                 Source<TabContents>(source).ptr()));
       }
       break;
 
-    case NotificationType::SSL_STATE_CHANGED:
+    case NotificationType::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 (GetSelectedTabContents() &&
           GetSelectedTabContents()->controller() ==
           Source<NavigationController>(source).ptr())
         UpdateToolbar(false);
@@ skipping 546 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }