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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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
Index: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
index 8ade6739d5dd0b9ed06f968df1dd048cf30487a2..86ea7e941b98e9269e237eae1c9f6f3562516428 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
@@ -15,9 +15,12 @@
class BookmarkBarView;
class BookmarkMenuControllerObserver;
class BookmarkMenuDelegate;
-class BookmarkNode;
class Browser;
+namespace bookmarks {
+class BookmarkNode;
+}
+
namespace content {
class PageNavigator;
}
@@ -45,7 +48,7 @@ class BookmarkMenuController : public bookmarks::BaseBookmarkModelObserver,
BookmarkMenuController(Browser* browser,
content::PageNavigator* page_navigator,
views::Widget* parent,
- const BookmarkNode* node,
+ const bookmarks::BookmarkNode* node,
int start_child_index,
bool for_drop);
@@ -59,7 +62,7 @@ class BookmarkMenuController : public bookmarks::BaseBookmarkModelObserver,
void Cancel();
// Returns the node the menu is showing for.
- const BookmarkNode* node() const { return node_; }
+ const bookmarks::BookmarkNode* node() const { return node_; }
// Returns the menu.
views::MenuItemView* menu() const;
@@ -122,7 +125,7 @@ class BookmarkMenuController : public bookmarks::BaseBookmarkModelObserver,
scoped_ptr<BookmarkMenuDelegate> menu_delegate_;
// The node we're showing the contents of.
- const BookmarkNode* node_;
+ const bookmarks::BookmarkNode* node_;
// Data for the drop.
bookmarks::BookmarkNodeData drop_data_;

Powered by Google App Engine
This is Rietveld 408576698