summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
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/sessions
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/sessions')
-rw-r--r--chrome/browser/sessions/base_session_service.cc4
-rw-r--r--chrome/browser/sessions/session_types.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index 832a26e..fcafbe0 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -156,7 +156,7 @@ SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand(
int bytes_written = 0;
WriteStringToPickle(pickle, &bytes_written, max_state_size,
- entry.display_url().spec());
+ entry.virtual_url().spec());
WriteString16ToPickle(pickle, &bytes_written, max_state_size, entry.title());
@@ -215,7 +215,7 @@ bool BaseSessionService::RestoreUpdateTabNavigationCommand(
}
bool BaseSessionService::ShouldTrackEntry(const NavigationEntry& entry) {
- return entry.display_url().is_valid();
+ return entry.virtual_url().is_valid();
}
bool BaseSessionService::ShouldTrackEntry(const TabNavigation& navigation) {
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index 14caf79..852fe8b 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -21,14 +21,14 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const {
// Use a transition type of reload so that we don't incorrectly
// increase the typed count.
PageTransition::RELOAD);
- entry->set_display_url(url_);
+ entry->set_virtual_url(url_);
entry->set_content_state(state_);
entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA);
return entry;
}
void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
- url_ = entry.display_url();
+ url_ = entry.virtual_url();
referrer_ = entry.referrer();
title_ = entry.title();
state_ = entry.content_state();