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

Unified Diff: chrome/browser/search_engines/template_url_service.h

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/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index 050a59c9352e0f198e113d5ce63777b512be2c0c..c029e2b32d8cb82ad873966b21380c5609f5316e 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -270,7 +270,7 @@ class TemplateURLService : public WebDataServiceConsumer,
// Returns all syncable TemplateURLs from this model as SyncData. This should
// include every search engine and no Extension keywords.
virtual syncer::SyncDataList GetAllSyncData(
- syncable::ModelType type) const OVERRIDE;
+ syncer::ModelType type) const OVERRIDE;
// Process new search engine changes from Sync, merging them into our local
// data. This may send notifications if local search engines are added,
// updated or removed.
@@ -281,11 +281,11 @@ class TemplateURLService : public WebDataServiceConsumer,
// to Sync. This may send notifications if local search engines are added,
// updated or removed.
virtual syncer::SyncError MergeDataAndStartSyncing(
- syncable::ModelType type,
+ syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
- virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
+ virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
// Processes a local TemplateURL change for Sync. |turl| is the TemplateURL
// that has been modified, and |type| is the Sync ChangeType that took place.
« no previous file with comments | « chrome/browser/prefs/pref_model_associator.cc ('k') | chrome/browser/search_engines/template_url_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698