diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:16:54 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:16:54 +0000 |
commit | ebe89e0676c12a6ebccb35fef1611323d1b35afb (patch) | |
tree | ec1d1715d14c3fb182f0d39fc9178b40c4951897 /chrome/browser/sessions | |
parent | 5e344a39782b73070a679f0d12a996a012c7e3de (diff) | |
download | chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.zip chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.tar.gz chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.tar.bz2 |
Reland r23357 since it doesn't seem to be the cause of unit test
failure:
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/165501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r-- | chrome/browser/sessions/base_session_service.cc | 4 | ||||
-rw-r--r-- | chrome/browser/sessions/session_types.cc | 4 |
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(); |