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

Side by Side Diff: ui/base/cocoa/touch_bar_forward_declarations.h

Issue 2835693003: [Mac] Build fix when using newer SDK (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ 5 #ifndef UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
6 #define UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ 6 #define UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
7 7
8 // Once Chrome no longer supports OSX 10.12.0, this file can be deleted. 8 // Once Chrome no longer supports OSX 10.12.0, this file can be deleted.
9 #import <AppKit/AppKit.h> 9 #import <AppKit/AppKit.h>
10 #import <Foundation/Foundation.h> 10 #import <Foundation/Foundation.h>
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 @end 87 @end
88 88
89 @protocol NSTouchBarDelegate<NSObject> 89 @protocol NSTouchBarDelegate<NSObject>
90 90
91 @optional 91 @optional
92 - (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar 92 - (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
93 makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier; 93 makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier;
94 @end 94 @end
95 95
96 #pragma clang assume_nonnull end
spqchan 2017/04/21 20:23:39 Instead of putting this here, it makes more sense
97
96 #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1 98 #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
97 99
98 // When compiling against the 10.12.1 SDK or later, just provide forward 100 // When compiling against the 10.12.1 SDK or later, just provide forward
99 // declarations to suppress the partial availability warnings. 101 // declarations to suppress the partial availability warnings.
100 102
101 @class NSCustomTouchBarItem; 103 @class NSCustomTouchBarItem;
102 @class NSGroupTouchBarItem; 104 @class NSGroupTouchBarItem;
103 @class NSTouchBar; 105 @class NSTouchBar;
104 @protocol NSTouchBarDelegate; 106 @protocol NSTouchBarDelegate;
105 @class NSTouchBarItem; 107 @class NSTouchBarItem;
106 108
107 @interface NSWindow (TouchBarSDK) 109 @interface NSWindow (TouchBarSDK)
108 @property(strong, readonly) NSTouchBar* touchBar; 110 @property(strong, readonly) NSTouchBar* touchBar;
109 @end 111 @end
110 112
111 #endif // MAC_OS_X_VERSION_10_12_1 113 #endif // MAC_OS_X_VERSION_10_12_1
112 114
113 extern "C" { 115 extern "C" {
Robert Sesek 2017/04/21 20:18:32 This section should probably just move up to be ne
114 #if !defined(MAC_OS_X_VERSION_10_12_1) || \ 116 #if !defined(MAC_OS_X_VERSION_10_12_1) || \
115 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1 117 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
116 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFixedSpaceSmall; 118 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFixedSpaceSmall;
117 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFlexibleSpace; 119 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFlexibleSpace;
118 #endif // MAC_OS_X_VERSION_10_12_1 120 #endif // MAC_OS_X_VERSION_10_12_1
119 } // extern "C" 121 } // extern "C"
120 122
121 #pragma clang assume_nonnull end
122 123
123 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ 124 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698