summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/autocomplete_text_field.mm
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/autocomplete_text_field.mm
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/autocomplete_text_field.mm')
-rw-r--r--chrome/browser/cocoa/autocomplete_text_field.mm10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/autocomplete_text_field.mm b/chrome/browser/cocoa/autocomplete_text_field.mm
index f69dcd3..a06ecac 100644
--- a/chrome/browser/cocoa/autocomplete_text_field.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field.mm
@@ -204,6 +204,11 @@
[self addCursorRect:[icon rect] cursor:[NSCursor arrowCursor]];
}
+// TODO(shess): -resetFieldEditorFrameIfNeeded is the place where
+// changes to the cell layout should be flushed. LocationBarViewMac
+// and ToolbarController are calling this routine directly, and I
+// think they are probably wrong.
+// http://crbug.com/40053
- (void)updateCursorAndToolTipRects {
// This will force |resetCursorRects| to be called, as it is not to be called
// directly.
@@ -367,4 +372,9 @@
actionMenuForEvent:event inRect:[self bounds] ofView:self];
}
+- (NSRect)starIconFrame {
+ AutocompleteTextFieldCell* cell = [self autocompleteTextFieldCell];
+ return [cell starIconFrameForFrame:[self bounds]];
+}
+
@end