diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
| commit | a4a1476522880f416690e9357eedaa40b5ac8a99 (patch) | |
| tree | bc2a8cc0a4942e16094f9a07859508583b03e169 /chrome/browser/search_engines/template_url_service.h | |
| parent | dade34b60910f213ae8f8fdd13709ec17581ef9e (diff) | |
| download | chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2 | |
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'.
Also remove aliases to those classes from 'syncable'.
BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,
Review URL: https://chromiumcodereview.appspot.com/10696087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_service.h')
| -rw-r--r-- | chrome/browser/search_engines/template_url_service.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index 050a59c..c029e2b 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. |