Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7766)

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.cc

Issue 7790018: Don't update URL bar or SSL icon for pending history navs until they commit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comment. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/tab_contents/navigation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
index d02a3fc9618e4113698d45c6e00b8ca79216e2dd..a7284d25aaccecf50a1faf2f87ba27ef706daa50 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model.cc
@@ -43,7 +43,7 @@ string16 ToolbarModel::GetText() const {
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();
@@ -69,7 +69,7 @@ ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const {
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;
@@ -119,7 +119,7 @@ string16 ToolbarModel::GetEVCertName() const {
// 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);
}
« no previous file with comments | « no previous file | content/browser/tab_contents/navigation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698