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

Unified Diff: chrome/browser/sync/glue/bookmark_change_processor.cc

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/bookmark_change_processor.cc
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 59e050899410093c14c75eb74e741da4044be0f5..8e31f924e91a83881be83b3513ac16618d1a4dab 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -46,8 +46,8 @@ static const char kMobileBookmarksTag[] = "synced_bookmarks";
BookmarkChangeProcessor::BookmarkChangeProcessor(
Profile* profile,
BookmarkModelAssociator* model_associator,
- DataTypeErrorHandler* error_handler)
- : ChangeProcessor(error_handler),
+ sync_driver::DataTypeErrorHandler* error_handler)
+ : sync_driver::ChangeProcessor(error_handler),
bookmark_model_(NULL),
profile_(profile),
model_associator_(model_associator) {
@@ -263,7 +263,7 @@ void BookmarkChangeProcessor::BookmarkNodeAdded(BookmarkModel* model,
int64 BookmarkChangeProcessor::CreateSyncNode(const BookmarkNode* parent,
BookmarkModel* model, int index, syncer::WriteTransaction* trans,
BookmarkModelAssociator* associator,
- DataTypeErrorHandler* error_handler) {
+ sync_driver::DataTypeErrorHandler* error_handler) {
const BookmarkNode* child = parent->GetChild(index);
DCHECK(child);
@@ -317,7 +317,7 @@ int64 BookmarkChangeProcessor::UpdateSyncNode(
BookmarkModel* model,
syncer::WriteTransaction* trans,
BookmarkModelAssociator* associator,
- DataTypeErrorHandler* error_handler) {
+ sync_driver::DataTypeErrorHandler* error_handler) {
// Lookup the sync node that's associated with |node|.
syncer::WriteNode sync_node(trans);
if (!associator->InitSyncNodeFromChromeId(node->id(), &sync_node)) {

Powered by Google App Engine
This is Rietveld 408576698