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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.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/cocoa/bookmarks/bookmark_name_folder_controller.h
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h
index 09f7b59a3526eae767977ec00693d675fbc2aa9f..e73aa0425bef65f8ea404ff33370e55a53b50fbd 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h
@@ -11,9 +11,12 @@
#include "base/memory/scoped_ptr.h"
class BookmarkModelObserverForCocoa;
-class BookmarkNode;
class Profile;
+namespace bookmarks {
+class BookmarkNode;
+}
+
// A controller for dialog to let the user create a new folder or
// rename an existing folder. Accessible from a context menu on a
// bookmark button or the bookmark bar.
@@ -28,8 +31,8 @@ class Profile;
// Weak; owned by the model. Can be NULL (see below). Either node_
// is non-NULL (renaming a folder), or parent_ is non-NULL (adding a
// new one).
- const BookmarkNode* node_;
- const BookmarkNode* parent_;
+ const bookmarks::BookmarkNode* node_;
+ const bookmarks::BookmarkNode* parent_;
int newIndex_;
base::scoped_nsobject<NSString> initialName_;
@@ -45,10 +48,10 @@ class Profile;
// node.
- (id)initWithParentWindow:(NSWindow*)window
profile:(Profile*)profile
- node:(const BookmarkNode*)node;
+ node:(const bookmarks::BookmarkNode*)node;
- (id)initWithParentWindow:(NSWindow*)window
profile:(Profile*)profile
- parent:(const BookmarkNode*)parent
+ parent:(const bookmarks::BookmarkNode*)parent
newIndex:(int)newIndex;
- (void)runAsModalSheet;
- (IBAction)cancel:(id)sender;

Powered by Google App Engine
This is Rietveld 408576698