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/app | |
| 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/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 3060453..312425b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8020,6 +8020,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types that we allow syncing."> Apps </message> + <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing."> + Foreign Sessions + </message> <!-- Encryption tab of the configure sync dialog --> <message name="IDS_SYNC_ENCRYPTION_INSTRUCTIONS" desc="Instructions for the encryption settings tab."> |