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

Unified Diff: chrome/browser/sync/failed_datatypes_handler.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/failed_datatypes_handler.cc
diff --git a/chrome/browser/sync/failed_datatypes_handler.cc b/chrome/browser/sync/failed_datatypes_handler.cc
index 4ed6798eee03f56a30af7e1f644d5761f3ffd321..4785e71d9758304f9b5f74d5154e6bfcc2a63178 100644
--- a/chrome/browser/sync/failed_datatypes_handler.cc
+++ b/chrome/browser/sync/failed_datatypes_handler.cc
@@ -16,9 +16,9 @@ FailedDatatypesHandler::~FailedDatatypesHandler() {
}
syncable::ModelTypeSet GetTypesFromErrorsList(
- const std::list<SyncError>& errors) {
+ const std::list<csync::SyncError>& errors) {
syncable::ModelTypeSet result;
- for (std::list<SyncError>::const_iterator it = errors.begin();
+ for (std::list<csync::SyncError>::const_iterator it = errors.begin();
it != errors.end(); ++it) {
DCHECK(!result.Has(it->type()));
result.Put(it->type());
@@ -33,7 +33,7 @@ syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
}
bool FailedDatatypesHandler::UpdateFailedDatatypes(
- const std::list<SyncError>& errors,
+ const std::list<csync::SyncError>& errors,
FailureType failure_type) {
const syncable::ModelTypeSet types = GetFailedTypes();
if (failure_type == RUNTIME) {
@@ -56,9 +56,10 @@ void FailedDatatypesHandler::OnUserChoseDatatypes() {
runtime_errors_.clear();
}
-std::string GetErrorStringFromErrors(const std::list<SyncError>& errors) {
+std::string GetErrorStringFromErrors(
+ const std::list<csync::SyncError>& errors) {
std::string message;
- for (std::list<SyncError>::const_iterator it = errors.begin();
+ for (std::list<csync::SyncError>::const_iterator it = errors.begin();
it != errors.end(); ++it) {
if (it != errors.begin()) {
message += ", ";

Powered by Google App Engine
This is Rietveld 408576698