| 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 is built with the 10.12.1 SDK, the NSTouchBar… classes can be | 8 // Once Chrome is built with the 10.12.1 SDK, the NSTouchBar… classes can be |
| 9 // referred to normally (instead of with NSClassFromString(@"…")), and this | 9 // referred to normally (instead of with NSClassFromString(@"…")), and this |
| 10 // file can be deleted. | 10 // file can be deleted. |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 @protocol NSTouchBarDelegate<NSObject> | 94 @protocol NSTouchBarDelegate<NSObject> |
| 95 | 95 |
| 96 @optional | 96 @optional |
| 97 - (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar | 97 - (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar |
| 98 makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier | 98 makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier |
| 99 NS_AVAILABLE_MAC(10_12_1); | 99 NS_AVAILABLE_MAC(10_12_1); |
| 100 @end | 100 @end |
| 101 | 101 |
| 102 NS_ASSUME_NONNULL_END | 102 NS_ASSUME_NONNULL_END |
| 103 | 103 |
| 104 #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1 |
| 105 |
| 106 // When compiling against the 10.12.1 SDK or later, just provide forward |
| 107 // declarations to suppress the partial availability warnings. |
| 108 @class NSCustomTouchBarItem; |
| 109 @class NSGroupTouchBarItem; |
| 110 @class NSTouchBar; |
| 111 @protocol NSTouchBarDelegate; |
| 112 @class NSTouchBarItem; |
| 113 |
| 104 #endif // MAC_OS_X_VERSION_10_12_1 | 114 #endif // MAC_OS_X_VERSION_10_12_1 |
| 105 | 115 |
| 106 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ | 116 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ |
| OLD | NEW |