Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: sync/internal_api/public/sessions/sync_session_snapshot.cc

Issue 11474036: Remove initial_sync_ended bits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/public/sessions/sync_session_snapshot.cc
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index d74ffa7fb7d53d5904ce5ab1f68ca056fc20c8c4..b0e9facbcf276542c4e9c72c2cda8d777a786a9a 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -12,8 +12,7 @@ namespace syncer {
namespace sessions {
SyncSessionSnapshot::SyncSessionSnapshot()
- : is_share_usable_(false),
- is_silenced_(false),
+ : is_silenced_(false),
num_encryption_conflicts_(0),
num_hierarchy_conflicts_(0),
num_server_conflicts_(0),
@@ -26,8 +25,6 @@ SyncSessionSnapshot::SyncSessionSnapshot()
SyncSessionSnapshot::SyncSessionSnapshot(
const ModelNeutralState& model_neutral_state,
- bool is_share_usable,
- ModelTypeSet initial_sync_ended,
const ProgressMarkerMap& download_progress_markers,
bool is_silenced,
int num_encryption_conflicts,
@@ -41,8 +38,6 @@ SyncSessionSnapshot::SyncSessionSnapshot(
const std::vector<int>& num_entries_by_type,
const std::vector<int>& num_to_delete_entries_by_type)
: model_neutral_state_(model_neutral_state),
- is_share_usable_(is_share_usable),
- initial_sync_ended_(initial_sync_ended),
download_progress_markers_(download_progress_markers),
is_silenced_(is_silenced),
num_encryption_conflicts_(num_encryption_conflicts),
@@ -79,9 +74,6 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
value->SetInteger(
"numServerChangesRemaining",
static_cast<int>(model_neutral_state_.num_server_changes_remaining));
- value->SetBoolean("isShareUsable", is_share_usable_);
- value->Set("initialSyncEnded",
- ModelTypeSetToValue(initial_sync_ended_));
value->Set("downloadProgressMarkers",
ProgressMarkerMapToValue(download_progress_markers_).release());
value->SetBoolean("isSilenced", is_silenced_);
@@ -130,14 +122,6 @@ int64 SyncSessionSnapshot::num_server_changes_remaining() const {
return model_neutral_state().num_server_changes_remaining;
}
-bool SyncSessionSnapshot::is_share_usable() const {
- return is_share_usable_;
-}
-
-ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
- return initial_sync_ended_;
-}
-
const ProgressMarkerMap&
SyncSessionSnapshot::download_progress_markers() const {
return download_progress_markers_;

Powered by Google App Engine
This is Rietveld 408576698