| OLD | NEW |
| 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 | 9 |
| 10 #import <Foundation/Foundation.h> | 10 #import <Foundation/Foundation.h> |
| 11 | 11 |
| 12 #if !defined(MAC_OS_X_VERSION_10_12_1) | 12 #if !defined(MAC_OS_X_VERSION_10_12_1) |
| 13 | 13 |
| 14 #pragma clang assume_nonnull begin | 14 #pragma clang assume_nonnull begin |
| 15 | 15 |
| 16 @class NSTouchBar, NSTouchBarItem; | 16 @class NSTouchBar, NSTouchBarItem; |
| 17 @protocol NSTouchBarDelegate; | 17 @protocol NSTouchBarDelegate; |
| 18 | 18 |
| 19 typedef float NSTouchBarItemPriority; | 19 typedef float NSTouchBarItemPriority; |
| 20 static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000; | 20 static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000; |
| 21 static const NSTouchBarItemPriority NSTouchBarItemPriorityNormal = 0; | 21 static const NSTouchBarItemPriority NSTouchBarItemPriorityNormal = 0; |
| 22 static const NSTouchBarItemPriority NSTouchBarItemPriorityLow = -1000; | 22 static const NSTouchBarItemPriority NSTouchBarItemPriorityLow = -1000; |
| 23 | 23 |
| 24 typedef NSString* NSTouchBarItemIdentifier; | 24 typedef NSString* NSTouchBarItemIdentifier; |
| 25 typedef NSString* NSTouchBarCustomizationIdentifier; | 25 typedef NSString* NSTouchBarCustomizationIdentifier; |
| 26 | 26 |
| 27 static const NSTouchBarItemIdentifier NSTouchBarItemIdentifierFixedSpaceSmall = |
| 28 @"NSTouchBarItemIdentifierFixedSpaceSmall"; |
| 29 |
| 30 static const NSTouchBarItemIdentifier NSTouchBarItemIdentifierFlexibleSpace = |
| 31 @"NSTouchBarItemIdentifierFlexibleSpace"; |
| 32 |
| 27 @interface NSTouchBar : NSObject<NSCoding> | 33 @interface NSTouchBar : NSObject<NSCoding> |
| 28 | 34 |
| 29 - (instancetype)init NS_DESIGNATED_INITIALIZER; | 35 - (instancetype)init NS_DESIGNATED_INITIALIZER; |
| 30 - (nullable instancetype)initWithCoder:(NSCoder*)aDecoder | 36 - (nullable instancetype)initWithCoder:(NSCoder*)aDecoder |
| 31 NS_DESIGNATED_INITIALIZER; | 37 NS_DESIGNATED_INITIALIZER; |
| 32 | 38 |
| 33 @property(copy, nullable) | 39 @property(copy, nullable) |
| 34 NSTouchBarCustomizationIdentifier customizationIdentifier; | 40 NSTouchBarCustomizationIdentifier customizationIdentifier; |
| 35 @property(copy) NSArray* customizationAllowedItemIdentifiers; | 41 @property(copy) NSArray* customizationAllowedItemIdentifiers; |
| 36 @property(copy) NSArray* customizationRequiredItemIdentifiers; | 42 @property(copy) NSArray* customizationRequiredItemIdentifiers; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 103 |
| 98 // When compiling against the 10.12.1 SDK or later, just provide forward | 104 // When compiling against the 10.12.1 SDK or later, just provide forward |
| 99 // declarations to suppress the partial availability warnings. | 105 // declarations to suppress the partial availability warnings. |
| 100 | 106 |
| 101 @class NSCustomTouchBarItem; | 107 @class NSCustomTouchBarItem; |
| 102 @class NSGroupTouchBarItem; | 108 @class NSGroupTouchBarItem; |
| 103 @class NSTouchBar; | 109 @class NSTouchBar; |
| 104 @protocol NSTouchBarDelegate; | 110 @protocol NSTouchBarDelegate; |
| 105 @class NSTouchBarItem; | 111 @class NSTouchBarItem; |
| 106 | 112 |
| 113 @interface NSWindow (TouchBarSDK) |
| 114 @property(strong, readonly) NSTouchBar* touchBar; |
| 115 @end |
| 116 |
| 107 #endif // MAC_OS_X_VERSION_10_12_1 | 117 #endif // MAC_OS_X_VERSION_10_12_1 |
| 108 | 118 |
| 109 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ | 119 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ |
| OLD | NEW |