| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ | 5 #ifndef CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ |
| 6 #define CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ | 6 #define CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/synchronization/lock.h" | 14 #include "base/synchronization/lock.h" |
| 15 #include "chrome/browser/history/history_types.h" | 15 #include "chrome/browser/history/history_types.h" |
| 16 #include "chrome/browser/sync/glue/data_type_error_handler.h" | 16 #include "chrome/browser/sync/glue/data_type_error_handler.h" |
| 17 #include "chrome/browser/sync/glue/model_associator.h" | 17 #include "chrome/browser/sync/glue/model_associator.h" |
| 18 #include "sync/protocol/password_specifics.pb.h" | 18 #include "sync/protocol/password_specifics.pb.h" |
| 19 | 19 |
| 20 class MessageLoop; | |
| 21 class PasswordStore; | 20 class PasswordStore; |
| 22 class ProfileSyncService; | 21 class ProfileSyncService; |
| 23 | 22 |
| 23 namespace base { |
| 24 class MessageLoop; |
| 25 } |
| 26 |
| 24 namespace content { | 27 namespace content { |
| 25 struct PasswordForm; | 28 struct PasswordForm; |
| 26 } | 29 } |
| 27 | 30 |
| 28 namespace syncer { | 31 namespace syncer { |
| 29 class WriteNode; | 32 class WriteNode; |
| 30 class WriteTransaction; | 33 class WriteTransaction; |
| 31 } | 34 } |
| 32 | 35 |
| 33 namespace browser_sync { | 36 namespace browser_sync { |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 ProfileSyncService* sync_service_; | 129 ProfileSyncService* sync_service_; |
| 127 PasswordStore* password_store_; | 130 PasswordStore* password_store_; |
| 128 int64 password_node_id_; | 131 int64 password_node_id_; |
| 129 | 132 |
| 130 // Abort association pending flag and lock. If this is set to true | 133 // Abort association pending flag and lock. If this is set to true |
| 131 // (via the AbortAssociation method), return from the | 134 // (via the AbortAssociation method), return from the |
| 132 // AssociateModels method as soon as possible. | 135 // AssociateModels method as soon as possible. |
| 133 base::Lock abort_association_pending_lock_; | 136 base::Lock abort_association_pending_lock_; |
| 134 bool abort_association_pending_; | 137 bool abort_association_pending_; |
| 135 | 138 |
| 136 MessageLoop* expected_loop_; | 139 base::MessageLoop* expected_loop_; |
| 137 | 140 |
| 138 PasswordToSyncIdMap id_map_; | 141 PasswordToSyncIdMap id_map_; |
| 139 SyncIdToPasswordMap id_map_inverse_; | 142 SyncIdToPasswordMap id_map_inverse_; |
| 140 DataTypeErrorHandler* error_handler_; | 143 DataTypeErrorHandler* error_handler_; |
| 141 | 144 |
| 142 DISALLOW_COPY_AND_ASSIGN(PasswordModelAssociator); | 145 DISALLOW_COPY_AND_ASSIGN(PasswordModelAssociator); |
| 143 }; | 146 }; |
| 144 | 147 |
| 145 } // namespace browser_sync | 148 } // namespace browser_sync |
| 146 | 149 |
| 147 #endif // CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ | 150 #endif // CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |