diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 05:33:47 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 05:33:47 +0000 |
| commit | fa746f3cd1810ddb6b62d07182b499627f827943 (patch) | |
| tree | 0bdd7fc643dcd9de63c372488e2c9c70fda2c1fc /chrome/browser/sessions/tab_restore_service.cc | |
| parent | 606f35b2219158c933a1befedec879c7eeeec86d (diff) | |
| download | chromium_src-fa746f3cd1810ddb6b62d07182b499627f827943.zip chromium_src-fa746f3cd1810ddb6b62d07182b499627f827943.tar.gz chromium_src-fa746f3cd1810ddb6b62d07182b499627f827943.tar.bz2 | |
Propagate NavigationEntry's timestamp to history and sync.
Null out the timestamp when restoring navigations from sync data.
Avoid has_*() checks when restoring navigations.
Pickle/unpickle the timestamp.
Remove now-unneeded timestamp reconciliation logic in SessionModelAssociator.
Add timestamp assertions to session restore and tab restore
browser tests.
Add sync integration test to make sure that the tab sync timestamps match the history timestamps.
BUG=128449
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=159153
Review URL: https://codereview.chromium.org/11000014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/tab_restore_service.cc')
| -rw-r--r-- | chrome/browser/sessions/tab_restore_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index cb7b68f..cba2432 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -530,7 +530,7 @@ void TabRestoreService::PopulateTab(Tab* tab, NavigationEntry* entry = (i == pending_index) ? controller->GetPendingEntry() : controller->GetEntryAtIndex(i); tab->navigations[i] = - TabNavigation::FromNavigationEntry(i, *entry, base::Time::Now()); + TabNavigation::FromNavigationEntry(i, *entry); } tab->timestamp = TimeNow(); tab->current_navigation_index = controller->GetCurrentEntryIndex(); |