Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button.h |
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h |
index 51bad93269b6e98ad0edefb6d6906bf83f133821..90af2ad19fb93d781acc52127c3c2aa2230e9361 100644 |
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h |
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h |
@@ -10,12 +10,12 @@ |
@class BookmarkBarFolderController; |
@class BookmarkButton; |
-class BookmarkNode; |
@class BrowserWindowController; |
class ThemeService; |
namespace bookmarks { |
class BookmarkModel; |
+class BookmarkNode; |
} |
// Protocol for a BookmarkButton's delegate, responsible for doing |
@@ -107,7 +107,7 @@ class BookmarkModel; |
// Determine if the drag pasteboard has any drag data of type |
// kBookmarkDictionaryListPboardType and, if so, return those elements |
// otherwise return an empty vector. |
-- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData; |
+- (std::vector<const bookmarks::BookmarkNode*>)retrieveBookmarkNodeData; |
// Return YES if we should show the drop indicator, else NO. In some |
// cases (e.g. hover open) we don't want to show the drop indicator. |
@@ -147,7 +147,7 @@ class BookmarkModel; |
- (void)addNewFolderControllerWithParentButton:(BookmarkButton*)parentButton; |
// Open all of the nodes for the given node with disposition. |
-- (void)openAll:(const BookmarkNode*)node |
+- (void)openAll:(const bookmarks::BookmarkNode*)node |
disposition:(WindowOpenDisposition)disposition; |
// There are several operations which may affect the contents of a bookmark |
@@ -163,7 +163,7 @@ class BookmarkModel; |
// Add a button for the given node to the bar or folder menu. This is safe |
// to call when a folder menu window is open as that window will be updated. |
// And index of -1 means to append to the end (bottom). |
-- (void)addButtonForNode:(const BookmarkNode*)node |
+- (void)addButtonForNode:(const bookmarks::BookmarkNode*)node |
atIndex:(NSInteger)buttonIndex; |
// Given a list or |urls| and |titles|, create new bookmark nodes and add |
@@ -184,7 +184,7 @@ class BookmarkModel; |
// Determine the controller containing the button representing |node|, if any. |
- (id<BookmarkButtonControllerProtocol>)controllerForNode: |
- (const BookmarkNode*)node; |
+ (const bookmarks::BookmarkNode*)node; |
@end // @protocol BookmarkButtonControllerProtocol |
@@ -213,7 +213,7 @@ class BookmarkModel; |
@property(assign, nonatomic) BOOL acceptsTrackIn; |
// Return the bookmark node associated with this button, or NULL. |
-- (const BookmarkNode*)bookmarkNode; |
+- (const bookmarks::BookmarkNode*)bookmarkNode; |
// Return YES if this is a folder button (the node has subnodes). |
- (BOOL)isFolder; |