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

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

Issue 1894903003: Mac: Fix SDK 10.11 Compile errors after clang roll in r387792 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mock BaseBubbleController Created 4 years, 8 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/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 07baee691dd6d40137e006f61b944da0f3e13fb1..09025681aa91818b635eac2631a7ae0fe6cf1c56 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -33,23 +33,15 @@
@implementation TabWindowOverlayWindow
- (const ui::ThemeProvider*)themeProvider {
- if ([self parentWindow])
- return [[[self parentWindow] windowController] themeProvider];
- return NULL;
+ return [[self parentWindow] themeProvider];
}
- (ThemedWindowStyle)themedWindowStyle {
- if ([self parentWindow])
- return [[[self parentWindow] windowController] themedWindowStyle];
- return NO;
+ return [[self parentWindow] themedWindowStyle];
}
- (NSPoint)themeImagePositionForAlignment:(ThemeImageAlignment)alignment {
- if ([self parentWindow]) {
- return [[[self parentWindow] windowController]
- themeImagePositionForAlignment:alignment];
- }
- return NSZeroPoint;
+ return [[self parentWindow] themeImagePositionForAlignment:alignment];
}
@end
« no previous file with comments | « chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm ('k') | ui/views/cocoa/native_widget_mac_nswindow.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698