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

Unified Diff: chrome/browser/sync/glue/password_model_associator.h

Issue 9978017: [Sync] - Upload the callstacks for errors so that the line number of error is in callstack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/password_model_associator.h
diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h
index e438a3a8dda314f2c55eb6753adbde5077213b6d..2a6332735fcb12e8f735e90f500d9aef2a911ee1 100644
--- a/chrome/browser/sync/glue/password_model_associator.h
+++ b/chrome/browser/sync/glue/password_model_associator.h
@@ -14,6 +14,7 @@
#include "base/compiler_specific.h"
#include "base/synchronization/lock.h"
#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/sync/glue/data_type_error_handler.h"
#include "chrome/browser/sync/glue/model_associator.h"
#include "sync/protocol/password_specifics.pb.h"
@@ -48,19 +49,20 @@ class PasswordModelAssociator
static syncable::ModelType model_type() { return syncable::PASSWORDS; }
PasswordModelAssociator(ProfileSyncService* sync_service,
- PasswordStore* password_store);
+ PasswordStore* password_store,
+ DataTypeErrorHandler* error_handler);
virtual ~PasswordModelAssociator();
// PerDataTypeAssociatorInterface implementation.
//
// Iterates through the sync model looking for matched pairs of items.
- virtual bool AssociateModels(SyncError* error) OVERRIDE;
+ virtual SyncError AssociateModels() OVERRIDE;
// Delete all password nodes.
bool DeleteAllNodes(sync_api::WriteTransaction* trans);
// Clears all associations.
- virtual bool DisassociateModels(SyncError* error) OVERRIDE;
+ virtual SyncError DisassociateModels() OVERRIDE;
// The has_nodes out param is true if the sync model has nodes other
// than the permanent tagged nodes.
@@ -93,9 +95,9 @@ class PasswordModelAssociator
// |sync_id| with that node's id.
virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
- bool WriteToPasswordStore(const PasswordVector* new_passwords,
- const PasswordVector* updated_passwords,
- const PasswordVector* deleted_passwords);
+ SyncError WriteToPasswordStore(const PasswordVector* new_passwords,
+ const PasswordVector* updated_passwords,
+ const PasswordVector* deleted_passwords);
static std::string MakeTag(const webkit::forms::PasswordForm& password);
static std::string MakeTag(const sync_pb::PasswordSpecificsData& password);
@@ -136,6 +138,7 @@ class PasswordModelAssociator
PasswordToSyncIdMap id_map_;
SyncIdToPasswordMap id_map_inverse_;
+ DataTypeErrorHandler* error_handler_;
DISALLOW_COPY_AND_ASSIGN(PasswordModelAssociator);
};
« no previous file with comments | « chrome/browser/sync/glue/password_change_processor.cc ('k') | chrome/browser/sync/glue/password_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698