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

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

Issue 871423004: Mac: Clean up outdated use of NSThemeFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@themed-drawing
Patch Set: No need to floor Created 5 years, 10 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/tabs/tab_window_controller.h ('k') | chrome/browser/ui/cocoa/themed_window.h » ('j') | 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 d49e5e7d1699b8ef5f759ade2186457f1564d314..0100d036f3a8f6ed9a3ba08387db664c2fc200ea 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -101,7 +101,7 @@
[tabStripView_ setAutoresizingMask:NSViewWidthSizable |
NSViewMinYMargin];
if (hasTabStrip)
- [self insertTabStripView:tabStripView_ intoWindow:[self window]];
+ [windowView addSubview:tabStripView_];
}
return self;
}
@@ -189,7 +189,7 @@
positioned:NSWindowBelow
relativeTo:nil];
originalContentView_.frame = [[window contentView] bounds];
- [self insertTabStripView:[self tabStripView] intoWindow:window];
+ [[window contentView] addSubview:[self tabStripView]];
[[window contentView] updateTrackingAreas];
[focusBeforeOverlay_ restoreFocusInWindow:window];
@@ -327,18 +327,6 @@
closeDeferred_ = YES;
}
-- (void)insertTabStripView:(NSView*)tabStripView intoWindow:(NSWindow*)window {
- NSView* contentParent = [window contentView];
- if (contentParent == [[window contentView] superview]) {
- // Add the tab strip directly above the content view, if they are siblings.
- [contentParent addSubview:tabStripView
- positioned:NSWindowAbove
- relativeTo:[window contentView]];
- } else {
- [contentParent addSubview:tabStripView];
- }
-}
-
- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window {
DCHECK(tabStripBackgroundView_);
NSView* rootView = [[window contentView] superview];
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_window_controller.h ('k') | chrome/browser/ui/cocoa/themed_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698