diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:54:58 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:54:58 +0000 |
| commit | 0a9c906458501e77a941ab107f2e1a9832a61e8c (patch) | |
| tree | 951af6237c04a9cc82383ccdfefe4d0d0b6c7036 /chrome/browser/sync/sessions | |
| parent | b385bc8a22f4e72c55c5de766959c58c31eb3989 (diff) | |
| download | chromium_src-0a9c906458501e77a941ab107f2e1a9832a61e8c.zip chromium_src-0a9c906458501e77a941ab107f2e1a9832a61e8c.tar.gz chromium_src-0a9c906458501e77a941ab107f2e1a9832a61e8c.tar.bz2 | |
[Sync] Attach payload to appropriate progress marker + unit tests.
BUG=68572
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/6574042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sessions')
| -rw-r--r-- | chrome/browser/sync/sessions/session_state.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/sync/sessions/session_state.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/sync/sessions/session_state.cc b/chrome/browser/sync/sessions/session_state.cc index e52ebdc..27457fb 100644 --- a/chrome/browser/sync/sessions/session_state.cc +++ b/chrome/browser/sync/sessions/session_state.cc @@ -4,7 +4,10 @@ #include "chrome/browser/sync/sessions/session_state.h" +#include <map> #include <set> +#include <string> +#include <utility> #include <vector> #include "base/base64.h" @@ -70,6 +73,10 @@ SyncSourceInfo::SyncSourceInfo() : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN) {} SyncSourceInfo::SyncSourceInfo( + const TypePayloadMap& t) + : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN), types(t) {} + +SyncSourceInfo::SyncSourceInfo( const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u, const TypePayloadMap& t) : updates_source(u), types(t) {} diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h index 69fbf7a..479cc7f 100644 --- a/chrome/browser/sync/sessions/session_state.h +++ b/chrome/browser/sync/sessions/session_state.h @@ -13,7 +13,10 @@ #define CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_ #pragma once +#include <map> #include <set> +#include <string> +#include <utility> #include <vector> #include "base/basictypes.h" @@ -63,6 +66,8 @@ void CoalescePayloads(TypePayloadMap* original, const TypePayloadMap& update); struct SyncSourceInfo { SyncSourceInfo(); SyncSourceInfo( + const TypePayloadMap& t); + SyncSourceInfo( const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u, const TypePayloadMap& t); ~SyncSourceInfo(); |