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

Unified Diff: chrome/browser/tab_contents/navigation_entry.cc

Issue 165485: Renames the NavigationEntry::display_url() to virtual_url(). (Closed)
Patch Set: Created 11 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
Index: chrome/browser/tab_contents/navigation_entry.cc
diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index 5a3ea9251a28cfc28f8f2a6fca3383debdcf6793..5030c5d8c221d023b3c958d56e739fef66ec0e7e 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -74,15 +74,15 @@ const string16& NavigationEntry::GetTitleForDisplay(
if (!cached_display_title_.empty())
return cached_display_title_;
- // Use the display URL first if any, and fall back on using the real URL.
+ // Use the virtual URL first if any, and fall back on using the real URL.
std::wstring languages;
if (navigation_controller) {
languages = navigation_controller->profile()->GetPrefs()->GetString(
prefs::kAcceptLanguages);
}
- if (!display_url_.is_empty()) {
+ if (!virtual_url_.is_empty()) {
cached_display_title_ = WideToUTF16Hack(net::FormatUrl(
- display_url_, languages));
+ virtual_url_, languages));
} else if (!url_.is_empty()) {
cached_display_title_ = WideToUTF16Hack(net::FormatUrl(url_, languages));
}
@@ -90,5 +90,5 @@ const string16& NavigationEntry::GetTitleForDisplay(
}
bool NavigationEntry::IsViewSourceMode() const {
- return display_url_.SchemeIs(chrome::kViewSourceScheme);
+ return virtual_url_.SchemeIs(chrome::kViewSourceScheme);
}
« no previous file with comments | « chrome/browser/tab_contents/navigation_entry.h ('k') | chrome/browser/tab_contents/navigation_entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698