| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 BASE_MAC_UTIL_H_ | 5 #ifndef BASE_MAC_MAC_UTIL_H_ |
| 6 #define BASE_MAC_UTIL_H_ | 6 #define BASE_MAC_MAC_UTIL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <Carbon/Carbon.h> | 9 #include <Carbon/Carbon.h> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 | 14 |
| 15 #if defined(__OBJC__) | 15 #if defined(__OBJC__) |
| 16 #import <Foundation/Foundation.h> | 16 #import <Foundation/Foundation.h> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 27 | 27 |
| 28 // Adapted from NSPathUtilities.h and NSObjCRuntime.h. | 28 // Adapted from NSPathUtilities.h and NSObjCRuntime.h. |
| 29 #if __LP64__ || NS_BUILD_32_LIKE_64 | 29 #if __LP64__ || NS_BUILD_32_LIKE_64 |
| 30 typedef unsigned long NSSearchPathDirectory; | 30 typedef unsigned long NSSearchPathDirectory; |
| 31 typedef unsigned long NSSearchPathDomainMask; | 31 typedef unsigned long NSSearchPathDomainMask; |
| 32 #else | 32 #else |
| 33 typedef unsigned int NSSearchPathDirectory; | 33 typedef unsigned int NSSearchPathDirectory; |
| 34 typedef unsigned int NSSearchPathDomainMask; | 34 typedef unsigned int NSSearchPathDomainMask; |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 namespace mac_util { | 37 namespace base { |
| 38 namespace mac { |
| 38 | 39 |
| 39 // Full screen modes, in increasing order of priority. More permissive modes | 40 // Full screen modes, in increasing order of priority. More permissive modes |
| 40 // take predecence. | 41 // take predecence. |
| 41 enum FullScreenMode { | 42 enum FullScreenMode { |
| 42 kFullScreenModeHideAll = 0, | 43 kFullScreenModeHideAll = 0, |
| 43 kFullScreenModeHideDock = 1, | 44 kFullScreenModeHideDock = 1, |
| 44 kFullScreenModeAutoHideAll = 2, | 45 kFullScreenModeAutoHideAll = 2, |
| 45 kNumFullScreenModes = 3, | 46 kNumFullScreenModes = 3, |
| 46 | 47 |
| 47 // kFullScreenModeNormal is not a valid FullScreenMode, but it is useful to | 48 // kFullScreenModeNormal is not a valid FullScreenMode, but it is useful to |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 CF_TO_NS_CAST(CFMutableSetRef, NSMutableSet); | 236 CF_TO_NS_CAST(CFMutableSetRef, NSMutableSet); |
| 236 CF_TO_NS_CAST(CFStringRef, NSString); | 237 CF_TO_NS_CAST(CFStringRef, NSString); |
| 237 CF_TO_NS_CAST(CFMutableStringRef, NSMutableString); | 238 CF_TO_NS_CAST(CFMutableStringRef, NSMutableString); |
| 238 CF_TO_NS_CAST(CFURLRef, NSURL); | 239 CF_TO_NS_CAST(CFURLRef, NSURL); |
| 239 CF_TO_NS_CAST(CFTimeZoneRef, NSTimeZone); | 240 CF_TO_NS_CAST(CFTimeZoneRef, NSTimeZone); |
| 240 CF_TO_NS_CAST(CFReadStreamRef, NSInputStream); | 241 CF_TO_NS_CAST(CFReadStreamRef, NSInputStream); |
| 241 CF_TO_NS_CAST(CFWriteStreamRef, NSOutputStream); | 242 CF_TO_NS_CAST(CFWriteStreamRef, NSOutputStream); |
| 242 | 243 |
| 243 #endif // __OBJC__ | 244 #endif // __OBJC__ |
| 244 | 245 |
| 245 } // namespace mac_util | 246 } // namespace mac |
| 247 } // namespace base |
| 246 | 248 |
| 247 #endif // BASE_MAC_UTIL_H_ | 249 #endif // BASE_MAC_MAC_UTIL_H_ |
| OLD | NEW |