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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 520733004: mac, yosemite: Resize button causes fullscreen effect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix z ordering, add browser test. Created 6 years, 3 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
Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 00bc9a2d7f6f39bcc704b66cfc704b58e0758ef1..574f8fe496d502c758df071c8c6c4fc3f22fe326 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -582,6 +582,7 @@ willPositionSheet:(NSWindow*)sheet
// or view manipulation Cocoa calls. Stack added to suppressions_mac.txt.
[contentView setAutoresizesSubviews:YES];
[destWindow setContentView:contentView];
+ [self moveContentViewToBack:contentView];
// Move the incognito badge if present.
if ([self shouldShowAvatar]) {
@@ -595,7 +596,7 @@ willPositionSheet:(NSWindow*)sheet
// Add the tab strip after setting the content view and moving the incognito
// badge (if any), so that the tab strip will be on top (in the z-order).
if ([self hasTabStrip])
- [[destWindow cr_windowView] addSubview:tabStripView];
+ [self insertTabStripView:tabStripView intoWindow:[self window]];
[sourceWindow setWindowController:nil];
[self setWindow:destWindow];

Powered by Google App Engine
This is Rietveld 408576698