summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/tab_window_controller.mm
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 00:58:17 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 00:58:17 +0000
commit7a1951a2d5a549f49714aa243c5f51fa9b86f7a8 (patch)
tree07805676229df685a71734c3a1b031168af057d1 /chrome/browser/cocoa/tab_window_controller.mm
parent7cd22a5102842cfbb51e06c626d769d81bb78210 (diff)
downloadchromium_src-7a1951a2d5a549f49714aa243c5f51fa9b86f7a8.zip
chromium_src-7a1951a2d5a549f49714aa243c5f51fa9b86f7a8.tar.gz
chromium_src-7a1951a2d5a549f49714aa243c5f51fa9b86f7a8.tar.bz2
More bookmark bar changes.
* Applied memory cleanliness fix in unit test; follow-up from http://codereview.chromium.org/149308. * Move bookmark bar into it's own nib; minor code refactor to accomodate. * The toolbar STAR button somehow lost it's action; added it back in. * Implemented delete bookmark notification callback so we behave (remove button from the screen) when a bookmark is deleted. * Added context menus for the bookmark bar and bookmark buttons. * Hooked up a handful of these menu items. E.g. - open in new tab, window, incog window - delete bookmark (finally) - bookmark manager (which then hits a NOTIMPLEMENTED()) - always show bookmark bar * Truncate bookmark button text on end, not on middle. Experimental to look more like Windows. It looks cleaner but is less Mac-like. * Add "draws border when mouse goes over" for bookmark buttons. Need to do it by hand since we have a custom button drawing method. BUG=crbug.com/8381 TEST=Here's a list: - Make sure the bookmark buttons don't have a border unless the mouse is over them - Toolbar "STAR" should now add bookmarks when clicked - Test context menus on bookmark buttons, and the bar itself - Confirm a few of the behaviors as listed in the 'what I hooked up'; e.g. Right click on bookmark --> delete menu item should delete button Review URL: http://codereview.chromium.org/155358 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_window_controller.mm')
-rw-r--r--chrome/browser/cocoa/tab_window_controller.mm6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm
index 14b6b7b..35d9f8b 100644
--- a/chrome/browser/cocoa/tab_window_controller.mm
+++ b/chrome/browser/cocoa/tab_window_controller.mm
@@ -16,10 +16,6 @@
@synthesize tabContentArea = tabContentArea_;
- (void)windowDidLoad {
- // TODO(jrg): a non-normal window (e.g. for pop-ups) needs more work
- // than just removal of the tab strip offset. But this is enough to
- // avoid confusion (e.g. "new tab" on popup gets created in a
- // different window).
if ([self isNormalWindow]) {
// Place the tab bar above the content box and add it to the view hierarchy
// as a sibling of the content view so it can overlap with the window frame.
@@ -27,8 +23,8 @@
tabFrame.origin = NSMakePoint(0, NSMaxY(tabFrame));
tabFrame.size.height = NSHeight([tabStripView_ frame]);
[tabStripView_ setFrame:tabFrame];
+ [[[[self window] contentView] superview] addSubview:tabStripView_];
}
- [[[[self window] contentView] superview] addSubview:tabStripView_];
}
- (void)removeOverlay {