Don't update URL bar or SSL icon for pending history navs until they commit.

chrome/browser/ui/toolbar/toolbar_model.cc

 // Copyright (c) 2011 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/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 25 matching lines @@
 // ToolbarModel Implementation.
 string16 ToolbarModel::GetText() const {
   GURL url(chrome::kAboutBlankURL);
   std::string languages;  // Empty if we don't have a |navigation_controller|.
 
   NavigationController* navigation_controller = GetNavigationController();
   if (navigation_controller) {
     Profile* profile =
         Profile::FromBrowserContext(navigation_controller->browser_context());
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
-    NavigationEntry* entry = navigation_controller->GetActiveEntry();
+    NavigationEntry* entry = navigation_controller->GetVisibleEntry();
     if (!navigation_controller->tab_contents()->ShouldDisplayURL()) {
       // Explicitly hide the URL for this tab.
       url = GURL();
     } else if (entry) {
       url = entry->virtual_url();
     }
   }
   if (url.spec().length() > content::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
   // Note that we can't unescape spaces here, because if the user copies this
   // and pastes it into another program, that program may think the URL ends at
   // the space.
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
       url, net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
                           UnescapeRule::NORMAL, NULL, NULL, NULL));
 }
 
 ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const {
   if (input_in_progress_)  // When editing, assume no security style.
     return NONE;
 
   NavigationController* navigation_controller = GetNavigationController();
   if (!navigation_controller)  // We might not have a controller on init.
     return NONE;
 
-  NavigationEntry* entry = navigation_controller->GetActiveEntry();
+  NavigationEntry* entry = navigation_controller->GetVisibleEntry();
   if (!entry)
     return NONE;
 
   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:
@@ skipping 29 matching lines @@
   DCHECK(arraysize(icon_ids) == NUM_SECURITY_LEVELS);
   return icon_ids[GetSecurityLevel()];
 }
 
 string16 ToolbarModel::GetEVCertName() const {
   DCHECK_EQ(GetSecurityLevel(), EV_SECURE);
   scoped_refptr<net::X509Certificate> cert;
   // Note: Navigation controller and active entry are guaranteed non-NULL or
   // the security level would be NONE.
   CertStore::GetInstance()->RetrieveCert(
-      GetNavigationController()->GetActiveEntry()->ssl().cert_id(), &cert);
+      GetNavigationController()->GetVisibleEntry()->ssl().cert_id(), &cert);
   return GetEVCertName(*cert);
 }
 
 // static
 string16 ToolbarModel::GetEVCertName(const net::X509Certificate& cert) {
   // EV are required to have an organization name and country.
   if (cert.subject().organization_names.empty() ||
       cert.subject().country_name.empty()) {
     NOTREACHED();
     return string16();
   }
 
   return l10n_util::GetStringFUTF16(
       IDS_SECURE_CONNECTION_EV,
       UTF8ToUTF16(cert.subject().organization_names[0]),
       UTF8ToUTF16(cert.subject().country_name));
 }
 
 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;
 }