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

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

Issue 2835693003: [Mac] Build fix when using newer SDK (Closed)
Patch Set: Move the begin instead 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>
11 11
12 #include "ui/base/ui_base_export.h" 12 #include "ui/base/ui_base_export.h"
13 13
14 #pragma clang assume_nonnull begin
15
14 #if !defined(MAC_OS_X_VERSION_10_12_1) 16 #if !defined(MAC_OS_X_VERSION_10_12_1)
15 17
16 #pragma clang assume_nonnull begin
17
18 @class NSTouchBar, NSTouchBarItem; 18 @class NSTouchBar, NSTouchBarItem;
19 @protocol NSTouchBarDelegate; 19 @protocol NSTouchBarDelegate;
20 20
21 typedef float NSTouchBarItemPriority; 21 typedef float NSTouchBarItemPriority;
22 static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000; 22 static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000;
23 static const NSTouchBarItemPriority NSTouchBarItemPriorityNormal = 0; 23 static const NSTouchBarItemPriority NSTouchBarItemPriorityNormal = 0;
24 static const NSTouchBarItemPriority NSTouchBarItemPriorityLow = -1000; 24 static const NSTouchBarItemPriority NSTouchBarItemPriorityLow = -1000;
25 25
26 typedef NSString* NSTouchBarItemIdentifier; 26 typedef NSString* NSTouchBarItemIdentifier;
27 typedef NSString* NSTouchBarCustomizationIdentifier; 27 typedef NSString* NSTouchBarCustomizationIdentifier;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 #pragma clang assume_nonnull end 121 #pragma clang assume_nonnull end
122 122
123 #endif // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_ 123 #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