(Original patch reviewed at http://codereview.chromium.org/2067003 )...

chrome/browser/toolbar_model.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/toolbar_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/pref_service.h"
@@ skipping 61 matching lines @@
   const NavigationEntry::SSLStatus& ssl = entry->ssl();
   switch (ssl.security_style()) {
     case SECURITY_STYLE_UNKNOWN:
     case SECURITY_STYLE_UNAUTHENTICATED:
       return NONE;
 
     case SECURITY_STYLE_AUTHENTICATION_BROKEN:
       return SECURITY_ERROR;
 
     case SECURITY_STYLE_AUTHENTICATED:
-      if (ssl.has_mixed_content())
+      if (ssl.displayed_mixed_content())
         return SECURITY_WARNING;
       if (net::IsCertStatusError(ssl.cert_status())) {
         DCHECK_EQ(ssl.cert_status() & net::CERT_STATUS_ALL_ERRORS,
                   net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION);
         return SECURITY_WARNING;
       }
       if ((ssl.cert_status() & net::CERT_STATUS_IS_EV) &&
           CertStore::GetSharedInstance()->RetrieveCert(ssl.cert_id(), NULL))
         return EV_SECURE;
       return SECURE;
@@ skipping 26 matching lines @@
   return SSLManager::GetEVCertName(*cert);
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }