OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/sessions/session_state.h" | 5 #include "chrome/browser/sync/sessions/session_state.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 28 matching lines...) Expand all Loading... |
39 DictionaryValue* SyncSourceInfo::ToValue() const { | 39 DictionaryValue* SyncSourceInfo::ToValue() const { |
40 DictionaryValue* value = new DictionaryValue(); | 40 DictionaryValue* value = new DictionaryValue(); |
41 value->SetString("updatesSource", | 41 value->SetString("updatesSource", |
42 GetUpdatesSourceString(updates_source)); | 42 GetUpdatesSourceString(updates_source)); |
43 value->Set("types", syncable::ModelTypePayloadMapToValue(types)); | 43 value->Set("types", syncable::ModelTypePayloadMapToValue(types)); |
44 return value; | 44 return value; |
45 } | 45 } |
46 | 46 |
47 SyncerStatus::SyncerStatus() | 47 SyncerStatus::SyncerStatus() |
48 : invalid_store(false), | 48 : invalid_store(false), |
49 syncer_stuck(false), | |
50 num_successful_commits(0), | 49 num_successful_commits(0), |
51 num_successful_bookmark_commits(0), | 50 num_successful_bookmark_commits(0), |
52 num_updates_downloaded_total(0), | 51 num_updates_downloaded_total(0), |
53 num_tombstone_updates_downloaded_total(0), | 52 num_tombstone_updates_downloaded_total(0), |
54 num_local_overwrites(0), | 53 num_local_overwrites(0), |
55 num_server_overwrites(0) { | 54 num_server_overwrites(0) { |
56 } | 55 } |
57 | 56 |
58 SyncerStatus::~SyncerStatus() { | 57 SyncerStatus::~SyncerStatus() { |
59 } | 58 } |
60 | 59 |
61 DictionaryValue* SyncerStatus::ToValue() const { | 60 DictionaryValue* SyncerStatus::ToValue() const { |
62 DictionaryValue* value = new DictionaryValue(); | 61 DictionaryValue* value = new DictionaryValue(); |
63 value->SetBoolean("invalidStore", invalid_store); | 62 value->SetBoolean("invalidStore", invalid_store); |
64 value->SetBoolean("syncerStuck", syncer_stuck); | |
65 value->SetInteger("numSuccessfulCommits", num_successful_commits); | 63 value->SetInteger("numSuccessfulCommits", num_successful_commits); |
66 value->SetInteger("numSuccessfulBookmarkCommits", | 64 value->SetInteger("numSuccessfulBookmarkCommits", |
67 num_successful_bookmark_commits); | 65 num_successful_bookmark_commits); |
68 value->SetInteger("numUpdatesDownloadedTotal", | 66 value->SetInteger("numUpdatesDownloadedTotal", |
69 num_updates_downloaded_total); | 67 num_updates_downloaded_total); |
70 value->SetInteger("numTombstoneUpdatesDownloadedTotal", | 68 value->SetInteger("numTombstoneUpdatesDownloadedTotal", |
71 num_tombstone_updates_downloaded_total); | 69 num_tombstone_updates_downloaded_total); |
72 value->SetInteger("numLocalOverwrites", num_local_overwrites); | 70 value->SetInteger("numLocalOverwrites", num_local_overwrites); |
73 value->SetInteger("numServerOverwrites", num_server_overwrites); | 71 value->SetInteger("numServerOverwrites", num_server_overwrites); |
74 return value; | 72 return value; |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 | 386 |
389 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) | 387 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) |
390 : conflict_progress(dirty_flag) { | 388 : conflict_progress(dirty_flag) { |
391 } | 389 } |
392 | 390 |
393 PerModelSafeGroupState::~PerModelSafeGroupState() { | 391 PerModelSafeGroupState::~PerModelSafeGroupState() { |
394 } | 392 } |
395 | 393 |
396 } // namespace sessions | 394 } // namespace sessions |
397 } // namespace browser_sync | 395 } // namespace browser_sync |
OLD | NEW |