| 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 #ifndef BASE_MAC_MAC_UTIL_H_ | 5 #ifndef BASE_MAC_MAC_UTIL_H_ |
| 6 #define BASE_MAC_MAC_UTIL_H_ | 6 #define BASE_MAC_MAC_UTIL_H_ |
| 7 | 7 |
| 8 #include <AvailabilityMacros.h> | 8 #include <AvailabilityMacros.h> |
| 9 #include <Carbon/Carbon.h> | 9 #include <Carbon/Carbon.h> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/base_export.h" | 12 #include "base/base_export.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 | 14 |
| 15 // TODO(rohitrao): Clean up sites that include mac_util.h and remove this line. | 15 // TODO(rohitrao): Clean up sites that include mac_util.h and remove this line. |
| 16 #include "base/mac/foundation_util.h" | 16 #include "base/mac/foundation_util.h" |
| 17 | 17 |
| 18 #if defined(__OBJC__) | 18 #if defined(__OBJC__) |
| 19 #import <Foundation/Foundation.h> | 19 #import <Foundation/Foundation.h> |
| 20 #else // __OBJC__ | 20 #else // __OBJC__ |
| 21 class NSImage; | 21 class NSImage; |
| 22 #endif // __OBJC__ | 22 #endif // __OBJC__ |
| 23 | 23 |
| 24 namespace base { |
| 25 |
| 24 class FilePath; | 26 class FilePath; |
| 25 | 27 |
| 26 namespace base { | |
| 27 namespace mac { | 28 namespace mac { |
| 28 | 29 |
| 29 // Full screen modes, in increasing order of priority. More permissive modes | 30 // Full screen modes, in increasing order of priority. More permissive modes |
| 30 // take predecence. | 31 // take predecence. |
| 31 enum FullScreenMode { | 32 enum FullScreenMode { |
| 32 kFullScreenModeHideAll = 0, | 33 kFullScreenModeHideAll = 0, |
| 33 kFullScreenModeHideDock = 1, | 34 kFullScreenModeHideDock = 1, |
| 34 kFullScreenModeAutoHideAll = 2, | 35 kFullScreenModeAutoHideAll = 2, |
| 35 kNumFullScreenModes = 3, | 36 kNumFullScreenModes = 3, |
| 36 | 37 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 // If any error occurs, none of the input pointers are touched. | 191 // If any error occurs, none of the input pointers are touched. |
| 191 BASE_EXPORT bool ParseModelIdentifier(const std::string& ident, | 192 BASE_EXPORT bool ParseModelIdentifier(const std::string& ident, |
| 192 std::string* type, | 193 std::string* type, |
| 193 int32* major, | 194 int32* major, |
| 194 int32* minor); | 195 int32* minor); |
| 195 | 196 |
| 196 } // namespace mac | 197 } // namespace mac |
| 197 } // namespace base | 198 } // namespace base |
| 198 | 199 |
| 199 #endif // BASE_MAC_MAC_UTIL_H_ | 200 #endif // BASE_MAC_MAC_UTIL_H_ |
| OLD | NEW |