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

Side by Side Diff: chrome/browser/ui/cocoa/framed_browser_window.h

Issue 2351183003: [Mac] Avoid "adding unknown subview" warning. (Closed)
Patch Set: Created 4 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 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 #ifndef CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_
6 #define CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_ 6 #define CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "chrome/browser/ui/cocoa/chrome_browser_window.h" 10 #include "chrome/browser/ui/cocoa/chrome_browser_window.h"
11 11
12 // Offsets from the top/left of the window frame to the top of the window 12 // Offsets from the top/left of the window frame to the top of the window
13 // controls (zoom, close, miniaturize) for a window with a tabstrip. 13 // controls (zoom, close, miniaturize) for a window with a tabstrip.
14 const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 11; 14 const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 11;
15 const NSInteger kFramedWindowButtonsWithTabStripOffsetFromLeft = 11; 15 const NSInteger kFramedWindowButtonsWithTabStripOffsetFromLeft = 11;
16 16
17 // Offsets from the top/left of the window frame to the top of the window 17 // Offsets from the top/left of the window frame to the top of the window
18 // controls (zoom, close, miniaturize) for a window without a tabstrip. 18 // controls (zoom, close, miniaturize) for a window without a tabstrip.
19 const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromTop = 4; 19 const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromTop = 4;
20 const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromLeft = 8; 20 const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromLeft = 8;
21 21
22 // The amount of window background image that is painted at the top of the 22 // The amount of window background image that is painted at the top of the
23 // window, so that it shows behind the tap strip area. 23 // window, so that it shows behind the tap strip area.
24 const CGFloat kBrowserFrameViewPaintHeight = 60.0; 24 const CGFloat kBrowserFrameViewPaintHeight = 37.0;
erikchen 2016/09/20 23:07:47 I imagine we'll need two variables, one for 10.11+
shrike 2016/09/20 23:27:17 Ugh. My assumption is that the frame paint height
25 25
26 // Cocoa class representing a framed browser window. 26 // Cocoa class representing a framed browser window.
27 // We need to override NSWindow with our own class since we need access to all 27 // We need to override NSWindow with our own class since we need access to all
28 // unhandled keyboard events and subclassing NSWindow is the only method to do 28 // unhandled keyboard events and subclassing NSWindow is the only method to do
29 // this. We also handle our own window controls and custom window frame drawing. 29 // this. We also handle our own window controls and custom window frame drawing.
30 @interface FramedBrowserWindow : ChromeBrowserWindow { 30 @interface FramedBrowserWindow : ChromeBrowserWindow {
31 @private 31 @private
32 BOOL shouldHideTitle_; 32 BOOL shouldHideTitle_;
33 BOOL hasTabStrip_; 33 BOOL hasTabStrip_;
34 NSButton* closeButton_; 34 NSButton* closeButton_;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 // Undocumented Cocoa API to suppress drawing of the window's title. 84 // Undocumented Cocoa API to suppress drawing of the window's title.
85 // -setTitle: still works, but the title set only applies to the 85 // -setTitle: still works, but the title set only applies to the
86 // miniwindow and menus (and, importantly, Expose). Overridden to 86 // miniwindow and menus (and, importantly, Expose). Overridden to
87 // return |shouldHideTitle_|. 87 // return |shouldHideTitle_|.
88 -(BOOL)_isTitleHidden; 88 -(BOOL)_isTitleHidden;
89 89
90 @end 90 @end
91 91
92 #endif // CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_ 92 #endif // CHROME_BROWSER_UI_COCOA_FRAMED_BROWSER_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698