Index: chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h |
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h |
index 7d7f18680c374b0234598ed6c6f9ac72cfb2bdf5..cf3e2e2cc9e2ea987bf3caa4c2193f10cddb8c87 100644 |
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h |
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h |
@@ -42,25 +42,25 @@ class BookmarkModelObserverForCocoa : public bookmarks::BookmarkModelObserver { |
// Starts and stops observing a specified |node|; the node must be contained |
// within the model. |
- void StartObservingNode(const BookmarkNode* node); |
- void StopObservingNode(const BookmarkNode* node); |
+ void StartObservingNode(const bookmarks::BookmarkNode* node); |
+ void StopObservingNode(const bookmarks::BookmarkNode* node); |
// bookmarks::BookmarkModelObserver: |
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 BookmarkNodeRemoved(bookmarks::BookmarkModel* model, |
- const BookmarkNode* parent, |
+ const bookmarks::BookmarkNode* parent, |
int old_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; |
// Some notifications we don't care about, but by being pure virtual |
// in the base class we must implement them. |
@@ -68,12 +68,14 @@ class BookmarkModelObserverForCocoa : public bookmarks::BookmarkModelObserver { |
void BookmarkModelLoaded(bookmarks::BookmarkModel* model, |
bool ids_reassigned) override {} |
void BookmarkNodeAdded(bookmarks::BookmarkModel* model, |
- const BookmarkNode* parent, |
+ const bookmarks::BookmarkNode* parent, |
int index) override {} |
- void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, |
- const BookmarkNode* node) override {} |
- void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, |
- const BookmarkNode* node) override {} |
+ void BookmarkNodeFaviconChanged( |
+ bookmarks::BookmarkModel* model, |
+ const bookmarks::BookmarkNode* node) override {} |
+ void BookmarkNodeChildrenReordered( |
+ bookmarks::BookmarkModel* model, |
+ const bookmarks::BookmarkNode* node) override {} |
void ExtensiveBookmarkChangesBeginning( |
bookmarks::BookmarkModel* model) override {} |
@@ -83,7 +85,8 @@ class BookmarkModelObserverForCocoa : public bookmarks::BookmarkModelObserver { |
private: |
bookmarks::BookmarkModel* model_; // Weak; it is owned by a Profile. |
- std::set<const BookmarkNode*> nodes_; // Weak items owned by a BookmarkModel. |
+ std::set<const bookmarks::BookmarkNode*> |
+ nodes_; // Weak items owned by a BookmarkModel. |
base::mac::ScopedBlock<ChangeCallback> callback_; |
// Send a notification to the client; |deleted| is YES if an observed node was |