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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.h

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 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_model_associator.h
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
index 82d95468a181eee995df9d00d7dd085c5d87f371..ebb891459d56da3155202de612008fe7ed7c4d2c 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.h
+++ b/chrome/browser/sync/glue/typed_url_model_associator.h
@@ -42,7 +42,7 @@ namespace browser_sync {
// * Persisting model associations and loading them back.
// We do not check if we have local data before this run; we always
// merge and sync.
-class TypedUrlModelAssociator : public AssociatorInterface {
+class TypedUrlModelAssociator : public sync_driver::AssociatorInterface {
public:
typedef std::vector<std::pair<GURL, std::vector<history::VisitInfo> > >
TypedUrlVisitVector;
@@ -50,7 +50,7 @@ class TypedUrlModelAssociator : public AssociatorInterface {
static syncer::ModelType model_type() { return syncer::TYPED_URLS; }
TypedUrlModelAssociator(ProfileSyncService* sync_service,
history::HistoryBackend* history_backend,
- DataTypeErrorHandler* error_handler);
+ sync_driver::DataTypeErrorHandler* error_handler);
virtual ~TypedUrlModelAssociator();
// AssociatorInterface implementation.
@@ -188,7 +188,8 @@ class TypedUrlModelAssociator : public AssociatorInterface {
bool abort_requested_;
base::Lock abort_lock_;
- DataTypeErrorHandler* error_handler_; // Guaranteed to outlive datatypes.
+ // Guaranteed to outlive datatypes.
+ sync_driver::DataTypeErrorHandler* error_handler_;
// Statistics for the purposes of tracking the percentage of DB accesses that
// fail for each client via UMA.
« no previous file with comments | « chrome/browser/sync/glue/typed_url_data_type_controller.cc ('k') | chrome/browser/sync/glue/typed_url_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698