Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // This file contains forward declarations for items in later SDKs than the | 5 // This file contains forward declarations for items in later SDKs than the |
| 6 // default one with which Chromium is built (currently 10.6). | 6 // default one with which Chromium is built (currently 10.6). |
| 7 // If you call any function from this header, be sure to check at runtime for | 7 // If you call any function from this header, be sure to check at runtime for |
| 8 // respondsToSelector: before calling these functions (else your code will crash | 8 // respondsToSelector: before calling these functions (else your code will crash |
| 9 // on older OS X versions that chrome still supports). | 9 // on older OS X versions that chrome still supports). |
| 10 | 10 |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 | 237 |
| 238 - (void)publish; | 238 - (void)publish; |
| 239 - (void)unpublish; | 239 - (void)unpublish; |
| 240 | 240 |
| 241 @end | 241 @end |
| 242 | 242 |
| 243 @interface NSScreen (MavericksSDK) | 243 @interface NSScreen (MavericksSDK) |
| 244 + (BOOL)screensHaveSeparateSpaces; | 244 + (BOOL)screensHaveSeparateSpaces; |
| 245 @end | 245 @end |
| 246 | 246 |
| 247 // NSAppearance is a new class in the 10.9 SDK. New classes cannot be | |
| 248 // forward-declared because they also require an @implementation, which would | |
| 249 // produce conflicting linkage. Instead, just declare the necessary pieces of | |
| 250 // the interface as a protocol, and treat objects of this type as id. | |
| 251 @protocol CrNSAppearance | |
| 252 - (NSString*)name; | |
|
Robert Sesek
2014/09/12 19:16:23
-name is a new property in 10.10, which is why it
dewittj
2014/09/12 23:24:20
Done.
| |
| 253 @end | |
| 254 | |
| 247 @interface NSView (MavericksSDK) | 255 @interface NSView (MavericksSDK) |
| 248 - (void)setCanDrawSubviewsIntoLayer:(BOOL)flag; | 256 - (void)setCanDrawSubviewsIntoLayer:(BOOL)flag; |
| 257 - (id<CrNSAppearance>)effectiveAppearance; | |
| 249 @end | 258 @end |
| 250 | 259 |
| 251 enum { | 260 enum { |
| 252 NSWindowOcclusionStateVisible = 1UL << 1, | 261 NSWindowOcclusionStateVisible = 1UL << 1, |
| 253 }; | 262 }; |
| 254 typedef NSUInteger NSWindowOcclusionState; | 263 typedef NSUInteger NSWindowOcclusionState; |
| 255 | 264 |
| 256 @interface NSWindow (MavericksSDK) | 265 @interface NSWindow (MavericksSDK) |
| 257 - (NSWindowOcclusionState)occlusionState; | 266 - (NSWindowOcclusionState)occlusionState; |
| 258 @end | 267 @end |
| 259 | 268 |
| 260 #endif // MAC_OS_X_VERSION_10_9 | 269 #endif // MAC_OS_X_VERSION_10_9 |
| 261 | 270 |
| 262 #if !defined(MAC_OS_X_VERSION_10_10) || \ | 271 #if !defined(MAC_OS_X_VERSION_10_10) || \ |
| 263 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10 | 272 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10 |
| 264 | 273 |
| 265 @interface NSUserActivity : NSObject | 274 @interface NSUserActivity : NSObject |
| 266 | 275 |
| 267 @property (readonly, copy) NSString* activityType; | 276 @property (readonly, copy) NSString* activityType; |
| 268 @property (copy) NSURL* webPageURL; | 277 @property (copy) NSURL* webPageURL; |
| 269 | 278 |
| 270 @end | 279 @end |
| 271 | 280 |
| 272 BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb; | 281 BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb; |
| 273 | 282 |
| 283 BASE_EXPORT extern "C" NSString* const NSAppearanceNameVibrantDark; | |
| 284 | |
| 274 #endif // MAC_OS_X_VERSION_10_10 | 285 #endif // MAC_OS_X_VERSION_10_10 |
| 275 | 286 |
| 276 #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_ | 287 #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_ |
| OLD | NEW |