| 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. | |
| 16 #include "base/mac/foundation_util.h" | |
| 17 | |
| 18 #if defined(__OBJC__) | 15 #if defined(__OBJC__) |
| 19 #import <Foundation/Foundation.h> | 16 #import <Foundation/Foundation.h> |
| 20 #else // __OBJC__ | 17 #else // __OBJC__ |
| 21 class NSImage; | 18 class NSImage; |
| 22 #endif // __OBJC__ | 19 #endif // __OBJC__ |
| 23 | 20 |
| 24 namespace base { | 21 namespace base { |
| 25 | 22 |
| 26 class FilePath; | 23 class FilePath; |
| 27 | 24 |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 // If any error occurs, none of the input pointers are touched. | 222 // If any error occurs, none of the input pointers are touched. |
| 226 BASE_EXPORT bool ParseModelIdentifier(const std::string& ident, | 223 BASE_EXPORT bool ParseModelIdentifier(const std::string& ident, |
| 227 std::string* type, | 224 std::string* type, |
| 228 int32* major, | 225 int32* major, |
| 229 int32* minor); | 226 int32* minor); |
| 230 | 227 |
| 231 } // namespace mac | 228 } // namespace mac |
| 232 } // namespace base | 229 } // namespace base |
| 233 | 230 |
| 234 #endif // BASE_MAC_MAC_UTIL_H_ | 231 #endif // BASE_MAC_MAC_UTIL_H_ |
| OLD | NEW |