diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 20:45:12 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 20:45:12 +0000 |
| commit | 5873de6186d9997573cfad69131a84f1b69ddd45 (patch) | |
| tree | b9f0f4bafa42705edb9f79f27e023c8204db08a5 /chrome/browser/tab_contents/navigation_entry.cc | |
| parent | d42561d79bc3940320d2aef268a64f2a34e52733 (diff) | |
| download | chromium_src-5873de6186d9997573cfad69131a84f1b69ddd45.zip chromium_src-5873de6186d9997573cfad69131a84f1b69ddd45.tar.gz chromium_src-5873de6186d9997573cfad69131a84f1b69ddd45.tar.bz2 | |
Renames the NavigationEntry::display_url() to virtual_url().
BUG=6970 (http://crbug.com/6970)
TEST=None
Patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/164383
Review URL: http://codereview.chromium.org/165485
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_entry.cc')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_entry.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc index 5a3ea92..5030c5d 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); } |