OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 entry. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/engine/conflict_resolver.h" | 5 #include "chrome/browser/sync/engine/conflict_resolver.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "chrome/browser/sync/engine/syncer.h" | 10 #include "chrome/browser/sync/engine/syncer.h" |
11 #include "chrome/browser/sync/engine/syncer_util.h" | 11 #include "chrome/browser/sync/engine/syncer_util.h" |
12 #include "chrome/browser/sync/protocol/service_constants.h" | 12 #include "chrome/browser/sync/protocol/service_constants.h" |
13 #include "chrome/browser/sync/sessions/status_controller.h" | 13 #include "chrome/browser/sync/sessions/status_controller.h" |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 conflict_set_count_map_.erase(i++); | 501 conflict_set_count_map_.erase(i++); |
502 // METRIC self resolved conflict sets ++. | 502 // METRIC self resolved conflict sets ++. |
503 } else { | 503 } else { |
504 ++i; | 504 ++i; |
505 } | 505 } |
506 } | 506 } |
507 return rv; | 507 return rv; |
508 } | 508 } |
509 | 509 |
510 } // namespace browser_sync | 510 } // namespace browser_sync |
OLD | NEW |