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

Side by Side Diff: chrome/browser/sync/glue/autofill_model_associator.h

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix final unit test <3 c++ Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_AUTOFILL_MODEL_ASSOCIATOR_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
6 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 public: 47 public:
48 static syncable::ModelType model_type() { return syncable::AUTOFILL; } 48 static syncable::ModelType model_type() { return syncable::AUTOFILL; }
49 AutofillModelAssociator(ProfileSyncService* sync_service, 49 AutofillModelAssociator(ProfileSyncService* sync_service,
50 WebDatabase* web_database, 50 WebDatabase* web_database,
51 PersonalDataManager* data_manager); 51 PersonalDataManager* data_manager);
52 virtual ~AutofillModelAssociator(); 52 virtual ~AutofillModelAssociator();
53 53
54 // PerDataTypeAssociatorInterface implementation. 54 // PerDataTypeAssociatorInterface implementation.
55 // 55 //
56 // Iterates through the sync model looking for matched pairs of items. 56 // Iterates through the sync model looking for matched pairs of items.
57 virtual bool AssociateModels(); 57 virtual bool AssociateModels(SyncError* error);
58 58
59 // Clears all associations. 59 // Clears all associations.
60 virtual bool DisassociateModels(); 60 virtual bool DisassociateModels(SyncError* error);
61 61
62 // The has_nodes out param is true if the sync model has nodes other 62 // The has_nodes out param is true if the sync model has nodes other
63 // than the permanent tagged nodes. 63 // than the permanent tagged nodes.
64 virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes); 64 virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
65 65
66 // See ModelAssociator interface. 66 // See ModelAssociator interface.
67 virtual void AbortAssociation(); 67 virtual void AbortAssociation();
68 68
69 // See ModelAssociator interface. 69 // See ModelAssociator interface.
70 virtual bool CryptoReadyIfNecessary(); 70 virtual bool CryptoReadyIfNecessary();
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // AssociateModels method as soon as possible. 179 // AssociateModels method as soon as possible.
180 base::Lock abort_association_pending_lock_; 180 base::Lock abort_association_pending_lock_;
181 bool abort_association_pending_; 181 bool abort_association_pending_;
182 182
183 DISALLOW_COPY_AND_ASSIGN(AutofillModelAssociator); 183 DISALLOW_COPY_AND_ASSIGN(AutofillModelAssociator);
184 }; 184 };
185 185
186 } // namespace browser_sync 186 } // namespace browser_sync
187 187
188 #endif // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_ 188 #endif // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698