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

Unified Diff: chrome/browser/sync/glue/typed_url_data_type_controller.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/glue/typed_url_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
index dc46aba2416c5f8bddd552aca76977fd93fbf13c..91741fcd49148529cf582d66d125f1ca61e117e4 100644
--- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc
+++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
@@ -72,8 +72,8 @@ TypedUrlDataTypeController::TypedUrlDataTypeController(
pref_registrar_.Add(prefs::kSavingBrowserHistoryDisabled, this);
}
-syncable::ModelType TypedUrlDataTypeController::type() const {
- return syncable::TYPED_URLS;
+syncer::ModelType TypedUrlDataTypeController::type() const {
+ return syncer::TYPED_URLS;
}
syncer::ModelSafeGroup TypedUrlDataTypeController::model_safe_group()
@@ -101,7 +101,7 @@ void TypedUrlDataTypeController::Observe(
// generate an unrecoverable error. This can be fixed by restarting
// Chrome (on restart, typed urls will not be a registered type).
if (state() != NOT_RUNNING && state() != STOPPING) {
- profile_sync_service()->DisableBrokenDatatype(syncable::TYPED_URLS,
+ profile_sync_service()->DisableBrokenDatatype(syncer::TYPED_URLS,
FROM_HERE, "History saving is now disabled by policy.");
}
}
« no previous file with comments | « chrome/browser/sync/glue/typed_url_data_type_controller.h ('k') | chrome/browser/sync/glue/typed_url_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698