diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 21:36:20 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 21:36:20 +0000 |
| commit | 987c09d491df35db519eb3f5dc398d51b179f7d5 (patch) | |
| tree | 71aea1a2577025e4296e0e63f772445f0ab4ab29 /chrome/browser/sync/sync_setup_wizard.cc | |
| parent | 9fd5ef1c0abde8ab8a27b33100da9cbf8ca393aa (diff) | |
| download | chromium_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/sync/sync_setup_wizard.cc')
| -rw-r--r-- | chrome/browser/sync/sync_setup_wizard.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc index 341e42d..147e112 100644 --- a/chrome/browser/sync/sync_setup_wizard.cc +++ b/chrome/browser/sync/sync_setup_wizard.cc @@ -115,7 +115,6 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw, AddString(dict, "success", IDS_SYNC_SUCCESS); AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN); AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS); - AddString(dict, "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL); AddString(dict, "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL); AddString(dict, "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL); @@ -141,6 +140,7 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw, AddString(dict, "extensions", IDS_SYNC_DATATYPE_EXTENSIONS); AddString(dict, "typedurls", IDS_SYNC_DATATYPE_TYPED_URLS); AddString(dict, "apps", IDS_SYNC_DATATYPE_APPS); + AddString(dict, "foreignsessions", IDS_SYNC_DATATYPE_SESSIONS); AddString(dict, "synczerodatatypeserror", IDS_SYNC_ZERO_DATA_TYPES_ERROR); AddString(dict, "abortederror", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR); |