Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 252 matching lines @@
       load_state_(net::LOAD_STATE_IDLE),
       load_state_host_(),
       upload_size_(0),
       upload_position_(0),
       received_page_title_(false),
       is_starred_(false),
       contents_mime_type_(),
       encoding_(),
       blocked_popups_(NULL),
       dont_notify_render_view_(false),
+      displayed_insecure_content_(false),
       infobar_delegates_(),
       find_ui_active_(false),
       find_op_aborted_(false),
       current_find_request_id_(find_request_id_counter_++),
       last_search_case_sensitive_(false),
       last_search_result_(),
       extension_app_(NULL),
       extension_app_for_current_page_(NULL),
       capturing_contents_(false),
       is_being_destroyed_(false),
@@ skipping 1292 matching lines @@
       AutoReset auto_reset(&dont_notify_render_view_, true);
       blocked_popups_->Destroy();
       blocked_popups_ = NULL;
     }
 
     // Clear "blocked" flags.
     ClearBlockedContentSettings();
     geolocation_settings_state_.DidNavigate(details);
     if (delegate_)
       delegate_->OnContentSettingsChange(this);
+
+    // Once the main frame is navigated, we're no longer considered to have
+    // displayed insecure content.
+    displayed_insecure_content_ = false;
   }
 
   // Close constrained windows if necessary.
   if (!net::RegistryControlledDomainService::SameDomainOrHost(
       details.previous_url, details.entry->url()))
     CloseConstrainedWindows();
 
   // Update the starred state.
   UpdateStarredStateForCurrentURL();
 
@@ skipping 449 matching lines @@
                                      GetRenderProcessHost()->id(), cert_id,
                                      cert_status);
 
   NotificationService::current()->Notify(
       NotificationType::LOAD_FROM_MEMORY_CACHE,
       Source<NavigationController>(&controller_),
       Details<LoadFromMemoryCacheDetails>(&details));
 }
 
 void TabContents::DidDisplayInsecureContent() {
-  controller_.ssl_manager()->DidDisplayInsecureContent();
+  displayed_insecure_content_ = true;
+  SSLManager::NotifySSLInternalStateChanged();
 }
 
 void TabContents::DidRunInsecureContent(const std::string& security_origin) {
   controller_.ssl_manager()->DidRunInsecureContent(security_origin);
 }
 
 void TabContents::DidFailProvisionalLoadWithError(
     RenderViewHost* render_view_host,
     bool is_main_frame,
     int error_code,
@@ skipping 1097 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }