| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
|
| index 1f94cd52b753a42313e1771c6ddfa1286932869c..5e8863b928909e0191d0716151b4bfea147cdbb3 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
|
| @@ -6,23 +6,21 @@
|
|
|
| #import "base/mac/cocoa_protocols.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
|
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
|
|
|
| class BookmarkBubbleNotificationBridge;
|
| class BookmarkModel;
|
| class BookmarkNode;
|
| @class BookmarkBubbleController;
|
| -@class InfoBubbleView;
|
|
|
|
|
| // Controller for the bookmark bubble. The bookmark bubble is a
|
| // bubble that pops up when clicking on the STAR next to the URL to
|
| // add or remove it as a bookmark. This bubble allows for editing of
|
| // the bookmark in various ways (name, folder, etc.)
|
| -@interface BookmarkBubbleController : NSWindowController<NSWindowDelegate> {
|
| +@interface BookmarkBubbleController : BaseBubbleController {
|
| @private
|
| - NSWindow* parentWindow_; // weak
|
| -
|
| // Both weak; owned by the current browser's profile
|
| BookmarkModel* model_; // weak
|
| const BookmarkNode* node_; // weak
|
| @@ -41,7 +39,6 @@ class BookmarkNode;
|
| IBOutlet NSTextField* bigTitle_; // "Bookmark" or "Bookmark Added!"
|
| IBOutlet NSTextField* nameTextField_;
|
| IBOutlet NSPopUpButton* folderPopUpButton_;
|
| - IBOutlet InfoBubbleView* bubble_; // to set arrow position
|
| }
|
|
|
| @property(readonly, nonatomic) const BookmarkNode* node;
|
| @@ -70,7 +67,7 @@ class BookmarkNode;
|
|
|
|
|
| // Exposed only for unit testing.
|
| -@interface BookmarkBubbleController(ExposedForUnitTesting)
|
| +@interface BookmarkBubbleController (ExposedForUnitTesting)
|
| - (void)addFolderNodes:(const BookmarkNode*)parent
|
| toPopUpButton:(NSPopUpButton*)button
|
| indentation:(int)indentation;
|
|
|