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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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
« no previous file with comments | « chrome/browser/importer/profile_writer.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | components/policy/core/browser/managed_bookmarks_tracker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f72ebd2e9bbdf5e6a3771245853c255eed909c29..e23c6e0e14e888914230a3cea388b6f02c0644dd 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.h
+++ b/chrome/browser/sync/glue/bookmark_change_processor.h
@@ -46,28 +46,29 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
bool ids_reassigned) override;
void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override;
void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
- const BookmarkNode* old_parent,
+ const bookmarks::BookmarkNode* old_parent,
int old_index,
- const BookmarkNode* new_parent,
+ const bookmarks::BookmarkNode* new_parent,
int new_index) override;
void BookmarkNodeAdded(bookmarks::BookmarkModel* model,
- const BookmarkNode* parent,
+ const bookmarks::BookmarkNode* parent,
int index) override;
void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
- const BookmarkNode* parent,
+ const bookmarks::BookmarkNode* parent,
int index,
- const BookmarkNode* node,
+ const bookmarks::BookmarkNode* node,
const std::set<GURL>& removed_urls) override;
void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model,
const std::set<GURL>& removed_urls) override;
void BookmarkNodeChanged(bookmarks::BookmarkModel* model,
- const BookmarkNode* node) override;
+ const bookmarks::BookmarkNode* node) override;
void BookmarkMetaInfoChanged(bookmarks::BookmarkModel* model,
- const BookmarkNode* node) override;
+ const bookmarks::BookmarkNode* node) override;
void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
- const BookmarkNode* node) override;
- void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model,
- const BookmarkNode* node) override;
+ const bookmarks::BookmarkNode* node) override;
+ void BookmarkNodeChildrenReordered(
+ bookmarks::BookmarkModel* model,
+ const bookmarks::BookmarkNode* node) override;
// The change processor implementation, responsible for applying changes from
// the sync model to the bookmarks model.
@@ -83,24 +84,25 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
// with data taken from the |sync_node| sync node.
static void UpdateBookmarkWithSyncData(const syncer::BaseNode& sync_node,
bookmarks::BookmarkModel* model,
- const BookmarkNode* node,
+ const bookmarks::BookmarkNode* node,
Profile* profile);
// Creates a bookmark node under the given parent node from the given sync
// node. Returns the newly created node. The created node is placed at the
// specified index among the parent's children.
- static const BookmarkNode* CreateBookmarkNode(syncer::BaseNode* sync_node,
- const BookmarkNode* parent,
- bookmarks::BookmarkModel* model,
- Profile* profile,
- int index);
+ static const bookmarks::BookmarkNode* CreateBookmarkNode(
+ syncer::BaseNode* sync_node,
+ const bookmarks::BookmarkNode* parent,
+ bookmarks::BookmarkModel* model,
+ Profile* profile,
+ int index);
// Sets the favicon of the given bookmark node from the given sync node.
// Returns whether the favicon was set in the bookmark node.
// |profile| is the profile that contains the HistoryService and BookmarkModel
// for the bookmark in question.
static bool SetBookmarkFavicon(const syncer::BaseNode* sync_node,
- const BookmarkNode* bookmark_node,
+ const bookmarks::BookmarkNode* bookmark_node,
bookmarks::BookmarkModel* model,
Profile* profile);
@@ -108,13 +110,13 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
// |profile| is the profile that contains the HistoryService and BookmarkModel
// for the bookmark in question.
static void ApplyBookmarkFavicon(
- const BookmarkNode* bookmark_node,
+ const bookmarks::BookmarkNode* bookmark_node,
Profile* profile,
const GURL& icon_url,
const scoped_refptr<base::RefCountedMemory>& bitmap_data);
// Sets the favicon of the given sync node from the given bookmark node.
- static void SetSyncNodeFavicon(const BookmarkNode* bookmark_node,
+ static void SetSyncNodeFavicon(const bookmarks::BookmarkNode* bookmark_node,
bookmarks::BookmarkModel* model,
syncer::WriteNode* sync_node);
@@ -123,7 +125,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
// will be transferred to the new node. A node corresponding to |parent|
// must already exist and be associated for this call to succeed. Returns
// the ID of the just-created node, or if creation fails, kInvalidID.
- static int64 CreateSyncNode(const BookmarkNode* parent,
+ static int64 CreateSyncNode(const bookmarks::BookmarkNode* parent,
bookmarks::BookmarkModel* model,
int index,
syncer::WriteTransaction* trans,
@@ -131,7 +133,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
sync_driver::DataTypeErrorHandler* error_handler);
// Update |bookmark_node|'s sync node.
- static int64 UpdateSyncNode(const BookmarkNode* bookmark_node,
+ static int64 UpdateSyncNode(const bookmarks::BookmarkNode* bookmark_node,
bookmarks::BookmarkModel* model,
syncer::WriteTransaction* trans,
BookmarkModelAssociator* associator,
@@ -142,7 +144,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
static void UpdateTransactionVersion(
int64 new_version,
bookmarks::BookmarkModel* model,
- const std::vector<const BookmarkNode*>& nodes);
+ const std::vector<const bookmarks::BookmarkNode*>& nodes);
protected:
void StartImpl() override;
@@ -154,11 +156,11 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
};
// Retrieves the meta info from the given sync node.
- static scoped_ptr<BookmarkNode::MetaInfoMap> GetBookmarkMetaInfo(
+ static scoped_ptr<bookmarks::BookmarkNode::MetaInfoMap> GetBookmarkMetaInfo(
const syncer::BaseNode* sync_node);
// Sets the meta info of the given sync node from the given bookmark node.
- static void SetSyncNodeMetaInfo(const BookmarkNode* node,
+ static void SetSyncNodeMetaInfo(const bookmarks::BookmarkNode* node,
syncer::WriteNode* sync_node);
// Helper function used to fix the position of a sync node so that it matches
@@ -170,19 +172,19 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
// SetPosition(). |trans| is the transaction to which |dst| belongs. Returns
// false on failure.
static bool PlaceSyncNode(MoveOrCreate operation,
- const BookmarkNode* parent,
+ const bookmarks::BookmarkNode* parent,
int index,
syncer::WriteTransaction* trans,
syncer::WriteNode* dst,
BookmarkModelAssociator* associator);
// Copy properties (but not position) from |src| to |dst|.
- static void UpdateSyncNodeProperties(const BookmarkNode* src,
+ static void UpdateSyncNodeProperties(const bookmarks::BookmarkNode* src,
bookmarks::BookmarkModel* model,
syncer::WriteNode* dst);
// Helper function to encode a bookmark's favicon into raw PNG data.
- static void EncodeFavicon(const BookmarkNode* src,
+ static void EncodeFavicon(const bookmarks::BookmarkNode* src,
bookmarks::BookmarkModel* model,
scoped_refptr<base::RefCountedMemory>* dst);
@@ -198,13 +200,13 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
const int64& topmost_node_id);
// Remove all the sync nodes associated with |node| and its children.
- void RemoveSyncNodeHierarchy(const BookmarkNode* node);
+ void RemoveSyncNodeHierarchy(const bookmarks::BookmarkNode* node);
// Creates or updates a sync node associated with |node|.
- void CreateOrUpdateSyncNode(const BookmarkNode* node);
+ void CreateOrUpdateSyncNode(const bookmarks::BookmarkNode* node);
// Returns false if |node| should not be synced.
- bool CanSyncNode(const BookmarkNode* node);
+ bool CanSyncNode(const bookmarks::BookmarkNode* node);
// The bookmark model we are processing changes from. Non-NULL when
// |running_| is true.
« no previous file with comments | « chrome/browser/importer/profile_writer.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | components/policy/core/browser/managed_bookmarks_tracker.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698