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

Unified Diff: chrome/browser/sync/sessions/status_controller.h

Issue 9107055: Remove single direction conflict set code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pre-emptive rebase Created 8 years, 11 months 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
« no previous file with comments | « chrome/browser/sync/sessions/session_state.h ('k') | chrome/browser/sync/sessions/status_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sessions/status_controller.h
diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h
index 5e397e1d97a405e2763051a32678e7fbc6e32c03..b072577254a5627a2dad08e45aa229527eca208f 100644
--- a/chrome/browser/sync/sessions/status_controller.h
+++ b/chrome/browser/sync/sessions/status_controller.h
@@ -138,9 +138,6 @@ class StatusController {
}
// Control parameters for sync cycles.
- bool conflict_sets_built() const {
- return shared_.control_params.conflict_sets_built;
- }
bool conflicts_resolved() const {
return shared_.control_params.conflicts_resolved;
}
@@ -232,7 +229,6 @@ class StatusController {
void set_last_process_commit_response_result(const SyncerError result);
void set_commit_set(const OrderedCommitSet& commit_set);
- void update_conflict_sets_built(bool built);
void update_conflicts_resolved(bool resolved);
void reset_conflicts_resolved();
void set_items_committed();
« no previous file with comments | « chrome/browser/sync/sessions/session_state.h ('k') | chrome/browser/sync/sessions/status_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698