summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_restore.cc
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:36:20 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:36:20 +0000
commit987c09d491df35db519eb3f5dc398d51b179f7d5 (patch)
tree71aea1a2577025e4296e0e63f772445f0ab4ab29 /chrome/browser/sessions/session_restore.cc
parent9fd5ef1c0abde8ab8a27b33100da9cbf8ca393aa (diff)
downloadchromium_src-987c09d491df35db519eb3f5dc398d51b179f7d5.zip
chromium_src-987c09d491df35db519eb3f5dc398d51b179f7d5.tar.gz
chromium_src-987c09d491df35db519eb3f5dc398d51b179f7d5.tar.bz2
Fix syncing of sessions. Numerous changes have been made. Currently, the model associator does not have a local model to associate with, but instead contains a buffer of protobuf specifics for foreign sessions which gets completely overwritten everytime an update occurs. This buffer is then used to create a vector of foreign sessions for each foreign session handler. As a result, The model associator is slightly different from other datatypes.
The creation of a persistent unique machine tag needs to be resolved still. Something understandable by the user would be good (home, work, etc.), but for now we use the directory kernel's cache_guid. Unfortunately, this gets reset each time sync is enabled/disabled, resulting in stale client session info that remains visible. BUG=30519 TEST=unit_test Review URL: http://codereview.chromium.org/3825005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_restore.cc')
-rw-r--r--chrome/browser/sessions/session_restore.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 46047a6..a537943 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -322,8 +322,8 @@ class SessionRestoreImpl : public NotificationObserver {
ShowBrowser(browser, initial_tab_count,
(*i)->selected_tab_index);
NotifySessionServiceOfRestoredTabs(browser, initial_tab_count);
- FinishedTabCreation(true, has_tabbed_browser);
}
+ FinishedTabCreation(true, has_tabbed_browser);
}
~SessionRestoreImpl() {