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

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

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 6 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.cc
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index 69044e5f56f8d0884692c788e64f604f209d1ba5..49ebb21934a96fce853343d6e245ada04b563e7d 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -47,8 +47,8 @@ PasswordModelAssociator::PasswordModelAssociator(
PasswordModelAssociator::~PasswordModelAssociator() {}
-SyncError PasswordModelAssociator::AssociateModels() {
- SyncError error;
+csync::SyncError PasswordModelAssociator::AssociateModels() {
+ csync::SyncError error;
DCHECK(expected_loop_ == MessageLoop::current());
{
base::AutoLock lock(abort_association_pending_lock_);
@@ -87,7 +87,7 @@ SyncError PasswordModelAssociator::AssociateModels() {
passwords.begin();
ix != passwords.end(); ++ix) {
if (IsAbortPending()) {
- return SyncError();
+ return csync::SyncError();
}
std::string tag = MakeTag(**ix);
@@ -197,10 +197,10 @@ bool PasswordModelAssociator::DeleteAllNodes(
return true;
}
-SyncError PasswordModelAssociator::DisassociateModels() {
+csync::SyncError PasswordModelAssociator::DisassociateModels() {
id_map_.clear();
id_map_inverse_.clear();
- return SyncError();
+ return csync::SyncError();
}
bool PasswordModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
@@ -292,7 +292,7 @@ bool PasswordModelAssociator::GetSyncIdForTaggedNode(const std::string& tag,
return true;
}
-SyncError PasswordModelAssociator::WriteToPasswordStore(
+csync::SyncError PasswordModelAssociator::WriteToPasswordStore(
const PasswordVector* new_passwords,
const PasswordVector* updated_passwords,
const PasswordVector* deleted_passwords) {
@@ -322,7 +322,7 @@ SyncError PasswordModelAssociator::WriteToPasswordStore(
// we use internal password store interfaces to make changes synchronously.
password_store_->PostNotifyLoginsChanged();
}
- return SyncError();
+ return csync::SyncError();
}
// static

Powered by Google App Engine
This is Rietveld 408576698