| Index: chrome/browser/sync/glue/bookmark_change_processor.h
|
| diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h
|
| index 7807b8dcb200b227e5d0c1ba4cee66aae61effea..ff0605f996888e79da2936bb2cf11c2a12ce24dc 100644
|
| --- a/chrome/browser/sync/glue/bookmark_change_processor.h
|
| +++ b/chrome/browser/sync/glue/bookmark_change_processor.h
|
| @@ -38,41 +38,39 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
|
| BookmarkChangeProcessor(Profile* profile,
|
| BookmarkModelAssociator* model_associator,
|
| sync_driver::DataTypeErrorHandler* error_handler);
|
| - virtual ~BookmarkChangeProcessor();
|
| + ~BookmarkChangeProcessor() override;
|
|
|
| // BookmarkModelObserver implementation.
|
| // BookmarkModel -> sync API model change application.
|
| - virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) override;
|
| - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| - virtual void BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) override;
|
| - virtual void BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) override;
|
| - virtual void BookmarkNodeRemoved(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index,
|
| - const BookmarkNode* node,
|
| + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
|
| + void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| + void BookmarkNodeMoved(BookmarkModel* model,
|
| + const BookmarkNode* old_parent,
|
| + int old_index,
|
| + const BookmarkNode* new_parent,
|
| + int new_index) override;
|
| + void BookmarkNodeAdded(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index) override;
|
| + void BookmarkNodeRemoved(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index,
|
| + const BookmarkNode* node,
|
| + const std::set<GURL>& removed_urls) override;
|
| + void BookmarkAllUserNodesRemoved(BookmarkModel* model,
|
| const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkAllUserNodesRemoved(
|
| - BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkMetaInfoChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| + void BookmarkNodeChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkMetaInfoChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
|
|
| // The change processor implementation, responsible for applying changes from
|
| // the sync model to the bookmarks model.
|
| - virtual void ApplyChangesFromSyncModel(
|
| + void ApplyChangesFromSyncModel(
|
| const syncer::BaseTransaction* trans,
|
| int64 model_version,
|
| const syncer::ImmutableChangeRecordList& changes) override;
|
| @@ -148,7 +146,7 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
|
| const std::vector<const BookmarkNode*>& nodes);
|
|
|
| protected:
|
| - virtual void StartImpl() override;
|
| + void StartImpl() override;
|
|
|
| private:
|
| enum MoveOrCreate {
|
|
|