Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5489)

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_window_controller.mm

Issue 520733004: mac, yosemite: Resize button causes fullscreen effect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/framed_browser_window.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
index c6dfa624f0ef37063166cb708b2cc7b1306d5482..a678e4e1ef48bf8199cf658a4aad0b368af0ea4b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -88,7 +88,14 @@
// The frame doesn't matter. This class relies on subclasses to do tab strip
// layout.
NSView* contentParent = [[self window] cr_windowView];
- [contentParent addSubview:tabStripView_];
+ if (contentParent == [[[self window] contentView] superview]) {
+ // Add the tab strip directly above the content view, if they are siblings.
+ [contentParent addSubview:tabStripView_
+ positioned:NSWindowAbove
+ relativeTo:[[self window] contentView]];
Andre 2014/08/30 01:38:02 We also mess with tabStripView in -[BrowserWindowC
erikchen 2014/09/02 17:35:57 yup. also have to do something similar for making
+ } else {
+ [contentParent addSubview:tabStripView_];
+ }
}
- (void)removeOverlay {
« no previous file with comments | « chrome/browser/ui/cocoa/framed_browser_window.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698