| 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 #import <AppKit/AppKit.h> | 9 #import <AppKit/AppKit.h> |
| 10 #import <Foundation/Foundation.h> | 10 #import <Foundation/Foundation.h> |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 #endif // MAC_OS_X_VERSION_10_12_1 | 111 #endif // MAC_OS_X_VERSION_10_12_1 |
| 112 | 112 |
| 113 extern "C" { | 113 extern "C" { |
| 114 #if !defined(MAC_OS_X_VERSION_10_12_1) || \ | 114 #if !defined(MAC_OS_X_VERSION_10_12_1) || \ |
| 115 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1 | 115 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1 |
| 116 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFixedSpaceSmall; | 116 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFixedSpaceSmall; |
| 117 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFlexibleSpace; | 117 UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFlexibleSpace; |
| 118 #endif // MAC_OS_X_VERSION_10_12_1 | 118 #endif // MAC_OS_X_VERSION_10_12_1 |
| 119 } // extern "C" | 119 } // extern "C" |
| 120 | 120 |
| 121 #if !defined(MAC_OS_X_VERSION_10_12_2) || \ |
| 122 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_2 |
| 123 |
| 124 @interface NSTouchBar (SierraPointTwoSDK) |
| 125 @property(copy, nullable) |
| 126 NSTouchBarItemIdentifier escapeKeyReplacementItemIdentifier; |
| 127 @end |
| 128 |
| 129 #endif // MAC_OS_X_VERSION_10_12_2 |
| 130 |
| 121 #pragma clang assume_nonnull end | 131 #pragma clang assume_nonnull end |
| 122 | 132 |
| 123 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ | 133 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ |
| OLD | NEW |