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

Side by Side Diff: webrtc/base/macutils.h

Issue 2299633002: Remove all reference to carbon api (Closed)
Patch Set: Fix chromium build errors Created 4 years, 3 months 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 | « webrtc/base/macsocketserver_unittest.cc ('k') | webrtc/base/macutils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2007 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2007 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_BASE_MACUTILS_H__ 11 #ifndef WEBRTC_BASE_MACUTILS_H__
12 #define WEBRTC_BASE_MACUTILS_H__ 12 #define WEBRTC_BASE_MACUTILS_H__
13 13
14 #include <CoreFoundation/CoreFoundation.h> 14 #include <CoreFoundation/CoreFoundation.h>
15 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
16 #include <Carbon/Carbon.h>
17 #endif
18 #include <string> 15 #include <string>
19 16
20 namespace rtc { 17 namespace rtc {
21 18
22 /////////////////////////////////////////////////////////////////////////////// 19 ///////////////////////////////////////////////////////////////////////////////
23 20
24 // Note that some of these functions work for both iOS and Mac OS X. The ones 21 // Note that some of these functions work for both iOS and Mac OS X. The ones
25 // that are specific to Mac are #ifdef'ed as such. 22 // that are specific to Mac are #ifdef'ed as such.
26 23
27 bool ToUtf8(const CFStringRef str16, std::string* str8); 24 bool ToUtf8(const CFStringRef str16, std::string* str8);
28 bool ToUtf16(const std::string& str8, CFStringRef* str16); 25 bool ToUtf16(const std::string& str8, CFStringRef* str16);
29 26
30 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 27 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
31 void DecodeFourChar(UInt32 fc, std::string* out); 28 void DecodeFourChar(UInt32 fc, std::string* out);
32 29
33 enum MacOSVersionName { 30 enum MacOSVersionName {
34 kMacOSUnknown, // ??? 31 kMacOSUnknown, // ???
35 kMacOSOlder, // 10.2- 32 kMacOSOlder, // 10.2-
36 kMacOSPanther, // 10.3 33 kMacOSPanther, // 10.3
37 kMacOSTiger, // 10.4 34 kMacOSTiger, // 10.4
38 kMacOSLeopard, // 10.5 35 kMacOSLeopard, // 10.5
39 kMacOSSnowLeopard, // 10.6 36 kMacOSSnowLeopard, // 10.6
40 kMacOSLion, // 10.7 37 kMacOSLion, // 10.7
41 kMacOSMountainLion, // 10.8 38 kMacOSMountainLion, // 10.8
42 kMacOSMavericks, // 10.9 39 kMacOSMavericks, // 10.9
43 kMacOSNewer, // 10.10+ 40 kMacOSNewer, // 10.10+
44 }; 41 };
45 42
46 MacOSVersionName GetOSVersionName(); 43 MacOSVersionName GetOSVersionName();
47
48 // Runs the given apple script. Only supports scripts that does not
49 // require user interaction.
50 bool RunAppleScript(const std::string& script);
51 #endif 44 #endif
52 45
53 /////////////////////////////////////////////////////////////////////////////// 46 ///////////////////////////////////////////////////////////////////////////////
54 47
55 } // namespace rtc 48 } // namespace rtc
56 49
57 #endif // WEBRTC_BASE_MACUTILS_H__ 50 #endif // WEBRTC_BASE_MACUTILS_H__
OLDNEW
« no previous file with comments | « webrtc/base/macsocketserver_unittest.cc ('k') | webrtc/base/macutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698