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

Side by Side Diff: base/mac/sdk_forward_declarations.h

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « base/files/file_path_watcher_win.cc ('k') | base/mac/sdk_forward_declarations.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 - (BluetoothConnectionHandle)connectionHandle; 203 - (BluetoothConnectionHandle)connectionHandle;
204 - (BluetoothHCIRSSIValue)rawRSSI; 204 - (BluetoothHCIRSSIValue)rawRSSI;
205 - (NSArray*)services; 205 - (NSArray*)services;
206 - (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids; 206 - (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids;
207 @end 207 @end
208 208
209 BASE_EXPORT extern "C" NSString* const NSWindowWillEnterFullScreenNotification; 209 BASE_EXPORT extern "C" NSString* const NSWindowWillEnterFullScreenNotification;
210 BASE_EXPORT extern "C" NSString* const NSWindowWillExitFullScreenNotification; 210 BASE_EXPORT extern "C" NSString* const NSWindowWillExitFullScreenNotification;
211 BASE_EXPORT extern "C" NSString* const NSWindowDidEnterFullScreenNotification; 211 BASE_EXPORT extern "C" NSString* const NSWindowDidEnterFullScreenNotification;
212 BASE_EXPORT extern "C" NSString* const NSWindowDidExitFullScreenNotification; 212 BASE_EXPORT extern "C" NSString* const NSWindowDidExitFullScreenNotification;
213 BASE_EXPORT extern "C" NSString* const
214 NSWindowDidChangeBackingPropertiesNotification;
213 215
214 @protocol NSWindowDelegateFullScreenAdditions 216 @protocol NSWindowDelegateFullScreenAdditions
215 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window; 217 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window;
216 - (void)windowDidFailToExitFullScreen:(NSWindow*)window; 218 - (void)windowDidFailToExitFullScreen:(NSWindow*)window;
217 @end 219 @end
218 220
219 #endif // MAC_OS_X_VERSION_10_7 221 #endif // MAC_OS_X_VERSION_10_7
220 222
221 #if !defined(MAC_OS_X_VERSION_10_8) || \ 223 #if !defined(MAC_OS_X_VERSION_10_8) || \
222 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8 224 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 288
287 enum { 289 enum {
288 NSWindowOcclusionStateVisible = 1UL << 1, 290 NSWindowOcclusionStateVisible = 1UL << 1,
289 }; 291 };
290 typedef NSUInteger NSWindowOcclusionState; 292 typedef NSUInteger NSWindowOcclusionState;
291 293
292 @interface NSWindow (MavericksSDK) 294 @interface NSWindow (MavericksSDK)
293 - (NSWindowOcclusionState)occlusionState; 295 - (NSWindowOcclusionState)occlusionState;
294 @end 296 @end
295 297
298
299 BASE_EXPORT extern "C" NSString* const
300 NSWindowDidChangeOcclusionStateNotification;
301
296 enum { 302 enum {
297 NSWorkspaceLaunchWithErrorPresentation = 0x00000040 303 NSWorkspaceLaunchWithErrorPresentation = 0x00000040
298 }; 304 };
299 305
300 #else // !MAC_OS_X_VERSION_10_9 306 #else // !MAC_OS_X_VERSION_10_9
301 307
302 typedef enum { 308 typedef enum {
303 kCWSecurityModeOpen = 0, 309 kCWSecurityModeOpen = 0,
304 kCWSecurityModeWEP, 310 kCWSecurityModeWEP,
305 kCWSecurityModeWPA_PSK, 311 kCWSecurityModeWPA_PSK,
(...skipping 12 matching lines...) Expand all
318 BASE_EXPORT extern "C" NSString* const kCWSSIDDidChangeNotification; 324 BASE_EXPORT extern "C" NSString* const kCWSSIDDidChangeNotification;
319 325
320 #endif // MAC_OS_X_VERSION_10_9 326 #endif // MAC_OS_X_VERSION_10_9
321 327
322 #if !defined(MAC_OS_X_VERSION_10_10) || \ 328 #if !defined(MAC_OS_X_VERSION_10_10) || \
323 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10 329 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
324 330
325 @interface NSUserActivity : NSObject 331 @interface NSUserActivity : NSObject
326 332
327 @property (readonly, copy) NSString* activityType; 333 @property (readonly, copy) NSString* activityType;
334 @property (copy) NSDictionary* userInfo;
328 @property (copy) NSURL* webPageURL; 335 @property (copy) NSURL* webPageURL;
329 336
330 @end 337 @end
331 338
332 BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb; 339 BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb;
333 340
334 BASE_EXPORT extern "C" NSString* const NSAppearanceNameVibrantDark; 341 BASE_EXPORT extern "C" NSString* const NSAppearanceNameVibrantDark;
335 342
336 #endif // MAC_OS_X_VERSION_10_10 343 #endif // MAC_OS_X_VERSION_10_10
337 344
338 #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_ 345 #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_
OLDNEW
« no previous file with comments | « base/files/file_path_watcher_win.cc ('k') | base/mac/sdk_forward_declarations.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698