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

Side by Side Diff: components/sync/engine_impl/conflict_resolver.cc

Issue 2387553002: [Sync] Removing duplicated includes between cc and h files. (Closed)
Patch Set: Fixing DataTypeStatusTable Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "components/sync/engine_impl/conflict_resolver.h" 5 #include "components/sync/engine_impl/conflict_resolver.h"
6 6
7 #include <list> 7 #include <list>
8 #include <set>
9 #include <string> 8 #include <string>
10 9
11 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
12 #include "components/sync/base/cryptographer.h" 11 #include "components/sync/base/cryptographer.h"
13 #include "components/sync/engine/cycle/update_counters.h" 12 #include "components/sync/engine/cycle/update_counters.h"
14 #include "components/sync/engine_impl/conflict_util.h" 13 #include "components/sync/engine_impl/conflict_util.h"
15 #include "components/sync/engine_impl/cycle/status_controller.h" 14 #include "components/sync/engine_impl/cycle/status_controller.h"
16 #include "components/sync/engine_impl/syncer_util.h" 15 #include "components/sync/engine_impl/syncer_util.h"
17 #include "components/sync/syncable/directory.h" 16 #include "components/sync/syncable/directory.h"
18 #include "components/sync/syncable/mutable_entry.h" 17 #include "components/sync/syncable/mutable_entry.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 GetModelTypeFromSpecifics(conflicting_node.GetSpecifics()))) { 276 GetModelTypeFromSpecifics(conflicting_node.GetSpecifics()))) {
278 continue; 277 continue;
279 } 278 }
280 279
281 ProcessSimpleConflict(trans, *it, cryptographer, status, counters); 280 ProcessSimpleConflict(trans, *it, cryptographer, status, counters);
282 } 281 }
283 return; 282 return;
284 } 283 }
285 284
286 } // namespace syncer 285 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/engine_impl/commit_util.cc ('k') | components/sync/engine_impl/cycle/data_type_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698