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-15 20:00:18 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 20:00:18 +0000
commit362bb99ffd47980be15a2a377cdcf6fad105b2ea (patch)
treee10cc865855852dc7ad620c0519d76543a0a739a /chrome/browser/cocoa/tab_window_controller.mm
parent5a10289c3ce115f4004f305a97bf30a91754e862 (diff)
downloadchromium_src-362bb99ffd47980be15a2a377cdcf6fad105b2ea.zip
chromium_src-362bb99ffd47980be15a2a377cdcf6fad105b2ea.tar.gz
chromium_src-362bb99ffd47980be15a2a377cdcf6fad105b2ea.tar.bz2
Mac pop-up window happier-ness.
BUG=http://crbug.com/15727, http://crbug.com/16063, http://crbug.com/16329 TEST=A few things. Bookmark bar test (16063): - open bookmark bar, then open popup. Popup should not have bmb. - close bookmark bar, then open popup. Popup should not have bmb. - In main window, toggle bmb a few times. Popup should not change. Tab at bottom bug (16329): - Open 'details' popup in gmail (next to 'last acct activity') - make sure no tab strip at the bottom of the window General (15727): - Open a popup. Make sure no toolbar (back/fwd buttons et al) Review URL: http://codereview.chromium.org/155444 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20773 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, 6 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm
index 35d9f8b..b9c9479 100644
--- a/chrome/browser/cocoa/tab_window_controller.mm
+++ b/chrome/browser/cocoa/tab_window_controller.mm
@@ -24,6 +24,12 @@
tabFrame.size.height = NSHeight([tabStripView_ frame]);
[tabStripView_ setFrame:tabFrame];
[[[[self window] contentView] superview] addSubview:tabStripView_];
+ } else {
+ // No tabstrip so remove the tabContentArea offset.
+ NSRect tabFrame = [tabContentArea_ frame];
+ NSRect contentFrame = [[[self window] contentView] frame];
+ tabFrame.size.height = contentFrame.size.height;
+ [tabContentArea_ setFrame:tabFrame];
}
}