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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" 5 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "base/mac/sdk_forward_declarations.h" 8 #import "base/mac/sdk_forward_declarations.h"
9 #import "chrome/browser/ui/cocoa/browser_window_layout.h" 9 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
10 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 10 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
(...skipping 15 matching lines...) Expand all
26 // of non-layer backed content like the window controls. 26 // of non-layer backed content like the window controls.
27 - (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window; 27 - (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window;
28 @end 28 @end
29 29
30 @interface TabWindowOverlayWindow : NSWindow 30 @interface TabWindowOverlayWindow : NSWindow
31 @end 31 @end
32 32
33 @implementation TabWindowOverlayWindow 33 @implementation TabWindowOverlayWindow
34 34
35 - (const ui::ThemeProvider*)themeProvider { 35 - (const ui::ThemeProvider*)themeProvider {
36 if ([self parentWindow]) 36 return [[self parentWindow] themeProvider];
37 return [[[self parentWindow] windowController] themeProvider];
38 return NULL;
39 } 37 }
40 38
41 - (ThemedWindowStyle)themedWindowStyle { 39 - (ThemedWindowStyle)themedWindowStyle {
42 if ([self parentWindow]) 40 return [[self parentWindow] themedWindowStyle];
43 return [[[self parentWindow] windowController] themedWindowStyle];
44 return NO;
45 } 41 }
46 42
47 - (NSPoint)themeImagePositionForAlignment:(ThemeImageAlignment)alignment { 43 - (NSPoint)themeImagePositionForAlignment:(ThemeImageAlignment)alignment {
48 if ([self parentWindow]) { 44 return [[self parentWindow] themeImagePositionForAlignment:alignment];
49 return [[[self parentWindow] windowController]
50 themeImagePositionForAlignment:alignment];
51 }
52 return NSZeroPoint;
53 } 45 }
54 46
55 @end 47 @end
56 48
57 @implementation TabWindowController 49 @implementation TabWindowController
58 50
59 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip { 51 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
60 const CGFloat kDefaultWidth = 750; 52 const CGFloat kDefaultWidth = 750;
61 const CGFloat kDefaultHeight = 600; 53 const CGFloat kDefaultHeight = 600;
62 54
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 [visualEffectView addSubview:tabStripBackgroundView_]; 383 [visualEffectView addSubview:tabStripBackgroundView_];
392 } 384 }
393 385
394 // Called when the size of the window content area has changed. Override to 386 // Called when the size of the window content area has changed. Override to
395 // position specific views. Base class implementation does nothing. 387 // position specific views. Base class implementation does nothing.
396 - (void)layoutSubviews { 388 - (void)layoutSubviews {
397 NOTIMPLEMENTED(); 389 NOTIMPLEMENTED();
398 } 390 }
399 391
400 @end 392 @end
OLDNEW
« 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