| 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_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ | 5 #ifndef COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ |
| 6 #define COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ | 6 #define COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "components/sync/base/model_type.h" |
| 13 #include "components/sync_driver/data_type_controller.h" | 14 #include "components/sync_driver/data_type_controller.h" |
| 14 #include "components/sync_driver/sync_prefs.h" | 15 #include "components/sync_driver/sync_prefs.h" |
| 15 #include "sync/internal_api/public/base/model_type.h" | |
| 16 | 16 |
| 17 namespace sync_driver { | 17 namespace sync_driver { |
| 18 class SyncClient; | 18 class SyncClient; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace syncer_v2 { | 21 namespace syncer_v2 { |
| 22 struct ActivationContext; | 22 struct ActivationContext; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace sync_driver_v2 { | 25 namespace sync_driver_v2 { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 // Controller receives |activation_context_| from SharedModelTypeProcessor | 128 // Controller receives |activation_context_| from SharedModelTypeProcessor |
| 129 // callback and must temporarily own it until ActivateDataType is called. | 129 // callback and must temporarily own it until ActivateDataType is called. |
| 130 std::unique_ptr<syncer_v2::ActivationContext> activation_context_; | 130 std::unique_ptr<syncer_v2::ActivationContext> activation_context_; |
| 131 | 131 |
| 132 DISALLOW_COPY_AND_ASSIGN(NonBlockingDataTypeController); | 132 DISALLOW_COPY_AND_ASSIGN(NonBlockingDataTypeController); |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 } // namespace sync_driver_v2 | 135 } // namespace sync_driver_v2 |
| 136 | 136 |
| 137 #endif // COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ | 137 #endif // COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_ |
| OLD | NEW |