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

Unified Diff: chrome/browser/sync/failed_datatypes_handler.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights 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 490140b7d6d0002397797783f62b383481e75fb7..effba20a03447eb2215f9c54d3f846236b8364a0 100644
--- a/chrome/browser/sync/failed_datatypes_handler.cc
+++ b/chrome/browser/sync/failed_datatypes_handler.cc
@@ -15,9 +15,9 @@ FailedDatatypesHandler::FailedDatatypesHandler(ProfileSyncService* service)
FailedDatatypesHandler::~FailedDatatypesHandler() {
}
-syncable::ModelTypeSet GetTypesFromErrorsList(
+syncer::ModelTypeSet GetTypesFromErrorsList(
const std::vector<syncer::SyncError>& errors) {
- syncable::ModelTypeSet result;
+ syncer::ModelTypeSet result;
for (std::vector<syncer::SyncError>::const_iterator it = errors.begin();
it != errors.end(); ++it) {
DCHECK(!result.Has(it->type()));
@@ -26,8 +26,8 @@ syncable::ModelTypeSet GetTypesFromErrorsList(
return result;
}
-syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
- syncable::ModelTypeSet result = GetTypesFromErrorsList(startup_errors_);
+syncer::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
+ syncer::ModelTypeSet result = GetTypesFromErrorsList(startup_errors_);
result.PutAll(GetTypesFromErrorsList(runtime_errors_));
return result;
}
@@ -35,7 +35,7 @@ syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
bool FailedDatatypesHandler::UpdateFailedDatatypes(
const std::list<syncer::SyncError>& errors,
FailureType failure_type) {
- const syncable::ModelTypeSet types = GetFailedTypes();
+ const syncer::ModelTypeSet types = GetFailedTypes();
if (failure_type == RUNTIME) {
runtime_errors_.insert(runtime_errors_.end(),
errors.begin(),
« no previous file with comments | « chrome/browser/sync/failed_datatypes_handler.h ('k') | chrome/browser/sync/glue/app_notification_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698