| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef SYNC_ENGINE_COMMIT_PROCESSOR_H_ | 5 #ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_ | 
| 6 #define SYNC_ENGINE_COMMIT_PROCESSOR_H_ | 6 #define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_ | 
| 7 | 7 | 
| 8 #include <stddef.h> | 8 #include <stddef.h> | 
| 9 | 9 | 
| 10 #include <map> | 10 #include <map> | 
| 11 #include <vector> | 11 #include <vector> | 
| 12 | 12 | 
| 13 #include "base/macros.h" | 13 #include "base/macros.h" | 
| 14 #include "sync/base/sync_export.h" | 14 #include "components/sync/base/model_type.h" | 
| 15 #include "sync/engine/commit.h" | 15 #include "components/sync/base/sync_export.h" | 
| 16 #include "sync/internal_api/public/base/model_type.h" | 16 #include "components/sync/engine/model_safe_worker.h" | 
| 17 #include "sync/internal_api/public/engine/model_safe_worker.h" | 17 #include "components/sync/engine_impl/commit.h" | 
| 18 #include "sync/sessions/model_type_registry.h" | 18 #include "components/sync/sessions_impl/model_type_registry.h" | 
| 19 | 19 | 
| 20 namespace syncer { | 20 namespace syncer { | 
| 21 | 21 | 
| 22 namespace syncable { | 22 namespace syncable { | 
| 23 class Directory; | 23 class Directory; | 
| 24 }  // namespace syncable | 24 }  // namespace syncable | 
| 25 | 25 | 
| 26 class CommitContributor; | 26 class CommitContributor; | 
| 27 class CommitContribution; | 27 class CommitContribution; | 
| 28 | 28 | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 55 | 55 | 
| 56  private: | 56  private: | 
| 57   // A map of 'commit contributors', one for each enabled type. | 57   // A map of 'commit contributors', one for each enabled type. | 
| 58   CommitContributorMap* commit_contributor_map_; | 58   CommitContributorMap* commit_contributor_map_; | 
| 59 | 59 | 
| 60   DISALLOW_COPY_AND_ASSIGN(CommitProcessor); | 60   DISALLOW_COPY_AND_ASSIGN(CommitProcessor); | 
| 61 }; | 61 }; | 
| 62 | 62 | 
| 63 }  // namespace syncer | 63 }  // namespace syncer | 
| 64 | 64 | 
| 65 #endif  // SYNC_ENGINE_COMMIT_PROCESSOR_H_ | 65 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_ | 
| OLD | NEW | 
|---|