summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/navigation_entry.h
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 20:45:12 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 20:45:12 +0000
commit5873de6186d9997573cfad69131a84f1b69ddd45 (patch)
treeb9f0f4bafa42705edb9f79f27e023c8204db08a5 /chrome/browser/tab_contents/navigation_entry.h
parentd42561d79bc3940320d2aef268a64f2a34e52733 (diff)
downloadchromium_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.h')
-rw-r--r--chrome/browser/tab_contents/navigation_entry.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 366b460..df060d4 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -219,7 +219,7 @@ class NavigationEntry {
}
// The actual URL of the page. For some about pages, this may be a scary
- // data: URL or something like that. Use display_url() below for showing to
+ // data: URL or something like that. Use virtual_url() below for showing to
// the user.
void set_url(const GURL& url) {
url_ = url;
@@ -237,22 +237,22 @@ class NavigationEntry {
return referrer_;
}
- // The display URL, when nonempty, will override the actual URL of the page
+ // The virtual URL, when nonempty, will override the actual URL of the page
// when we display it to the user. This allows us to have nice and friendly
// URLs that the user sees for things like about: URLs, but actually feed
// the renderer a data URL that results in the content loading.
//
- // display_url() will return the URL to display to the user in all cases, so
+ // virtual_url() will return the URL to display to the user in all cases, so
// if there is no overridden display URL, it will return the actual one.
- void set_display_url(const GURL& url) {
- display_url_ = (url == url_) ? GURL() : url;
+ void set_virtual_url(const GURL& url) {
+ virtual_url_ = (url == url_) ? GURL() : url;
cached_display_title_.clear();
}
- bool has_display_url() const {
- return !display_url_.is_empty();
+ bool has_virtual_url() const {
+ return !virtual_url_.is_empty();
}
- const GURL& display_url() const {
- return display_url_.is_empty() ? url_ : display_url_;
+ const GURL& virtual_url() const {
+ return virtual_url_.is_empty() ? url_ : virtual_url_;
}
// The title as set by the page. This will be empty if there is no title set.
@@ -385,7 +385,7 @@ class NavigationEntry {
PageType page_type_;
GURL url_;
GURL referrer_;
- GURL display_url_;
+ GURL virtual_url_;
string16 title_;
FaviconStatus favicon_;
std::string content_state_;
@@ -398,7 +398,7 @@ class NavigationEntry {
// This is a cached version of the result of GetTitleForDisplay. It prevents
// us from having to do URL formatting on the URL evey time the title is
- // displayed. When the URL, display URL, or title is set, this should be
+ // displayed. When the URL, virtual URL, or title is set, this should be
// cleared to force a refresh.
string16 cached_display_title_;