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

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

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments 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/new_non_frontend_data_type_controller.h
diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.h b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.h
index 9ff8ec44e0969070e21271142245446f5b77dc79..1927520bb9fc02eaccd919150ce7d42567f099d1 100644
--- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.h
+++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.h
@@ -11,7 +11,9 @@
#include "chrome/browser/sync/glue/non_frontend_data_type_controller.h"
#include "chrome/browser/sync/glue/shared_change_processor.h"
+namespace {
class SyncableService;
+}
namespace browser_sync {
@@ -41,10 +43,10 @@ class NewNonFrontendDataTypeController : public NonFrontendDataTypeController {
// Overrides of NonFrontendDataTypeController methods.
virtual void StartDone(DataTypeController::StartResult result,
DataTypeController::State new_state,
- const SyncError& error) OVERRIDE;
+ const csync::SyncError& error) OVERRIDE;
virtual void StartDoneImpl(DataTypeController::StartResult result,
DataTypeController::State new_state,
- const SyncError& error) OVERRIDE;
+ const csync::SyncError& error) OVERRIDE;
private:
// This overrides the same method in |NonFrontendDataTypeController|.
@@ -91,7 +93,7 @@ class NewNonFrontendDataTypeController : public NonFrontendDataTypeController {
// DataType's thread.
// Lifetime: it gets set in StartAssociation() and released in
// StopLocalService().
- base::WeakPtr<SyncableService> local_service_;
+ base::WeakPtr<csync::SyncableService> local_service_;
};
} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/glue/model_associator_mock.h ('k') | chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698