summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmark_bubble_controller.h
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 19:47:18 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 19:47:18 +0000
commit36d6a5006422d2c1902855d53446758169b321da (patch)
tree9b24ae766f89a1299c7fad81a51165cd0c4fa8c2 /chrome/browser/cocoa/bookmark_bubble_controller.h
parentea7763a4811a83a78085e8abd3784f634589949e (diff)
downloadchromium_src-36d6a5006422d2c1902855d53446758169b321da.zip
chromium_src-36d6a5006422d2c1902855d53446758169b321da.tar.gz
chromium_src-36d6a5006422d2c1902855d53446758169b321da.tar.bz2
[Mac] Move star button into page-actions area of omnibox.
Removes the star button from the toolbar entirely. Adds a LocationBarImageView subclass for the star icon and wires it to the RHS of the field. Adjust the bookmark bubble to move the arrow to the RHS and position appropriately. BookmarkBubble.xib: outlet to view so that controller can change the arrow from left to right. Toolbar.xib: Move reload icon to where star was, remove star icon, adjust spacing. All spacing was adjusted to specific positions in the relevant inspector, not by mouse drag, so hopefully there's nothing awry there. BUG=37865 TEST=No star icon on toolbar. TEST=Optional home button adjustments should work right. TEST=Star action in omnibox when showing an URL. TEST=Star action can be clicked to bookmark current page. TEST=Bookmark bubble arrow points at star like before. TEST=Command-d brings up bookmark bubble. TEST=Star action changes from blank to yellow depending on state. TEST=Star action tooltip changes depending on state. Review URL: http://codereview.chromium.org/1540009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bubble_controller.h')
-rw-r--r--chrome/browser/cocoa/bookmark_bubble_controller.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.h b/chrome/browser/cocoa/bookmark_bubble_controller.h
index 1a95300..68f835f 100644
--- a/chrome/browser/cocoa/bookmark_bubble_controller.h
+++ b/chrome/browser/cocoa/bookmark_bubble_controller.h
@@ -10,6 +10,7 @@
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
@@ -18,7 +19,7 @@ class BookmarkNode;
@interface BookmarkBubbleController : NSWindowController<NSWindowDelegate> {
@private
NSWindow* parentWindow_; // weak
- NSPoint topLeftForBubble_;
+ NSPoint topRightForBubble_;
// Both weak; owned by the current browser's profile
BookmarkModel* model_; // weak
@@ -32,6 +33,7 @@ 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;
@@ -43,7 +45,7 @@ class BookmarkNode;
// it desires it to be visible on the screen. It is not shown by the
// init routine. Closing of the window happens implicitly on dealloc.
- (id)initWithParentWindow:(NSWindow*)parentWindow
- topLeftForBubble:(NSPoint)topLeftForBubble
+ topRightForBubble:(NSPoint)topRightForBubble
model:(BookmarkModel*)model
node:(const BookmarkNode*)node
alreadyBookmarked:(BOOL)alreadyBookmarked;