| 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 COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ | 5 #ifndef COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ |
| 6 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ | 6 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 11 #include "base/timer/timer.h" | 12 #include "base/timer/timer.h" |
| 12 | 13 |
| 13 #include "components/sync_driver/data_type_manager.h" | 14 #include "components/sync_driver/data_type_manager.h" |
| 14 #include "sync/internal_api/public/data_type_association_stats.h" | 15 #include "sync/internal_api/public/data_type_association_stats.h" |
| 15 #include "sync/internal_api/public/util/weak_handle.h" | 16 #include "sync/internal_api/public/util/weak_handle.h" |
| 16 | 17 |
| 17 namespace sync_driver { | 18 namespace sync_driver { |
| 18 | 19 |
| 19 class DataTypeController; | 20 class DataTypeController; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 DataTypeManager::ConfigureStatus configure_status_; | 155 DataTypeManager::ConfigureStatus configure_status_; |
| 155 | 156 |
| 156 base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_; | 157 base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_; |
| 157 | 158 |
| 158 DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager); | 159 DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager); |
| 159 }; | 160 }; |
| 160 | 161 |
| 161 } // namespace sync_driver | 162 } // namespace sync_driver |
| 162 | 163 |
| 163 #endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ | 164 #endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ |
| OLD | NEW |