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

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

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: 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
15 #include <string> 18 #include <string>
16 19
17 namespace rtc { 20 namespace rtc {
18 21
19 /////////////////////////////////////////////////////////////////////////////// 22 ///////////////////////////////////////////////////////////////////////////////
20 23
21 // Note that some of these functions work for both iOS and Mac OS X. The ones 24 // Note that some of these functions work for both iOS and Mac OS X. The ones
22 // that are specific to Mac are #ifdef'ed as such. 25 // that are specific to Mac are #ifdef'ed as such.
23 26
24 bool ToUtf8(const CFStringRef str16, std::string* str8); 27 bool ToUtf8(const CFStringRef str16, std::string* str8);
25 bool ToUtf16(const std::string& str8, CFStringRef* str16); 28 bool ToUtf16(const std::string& str8, CFStringRef* str16);
26 29
27 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 30 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
28 void DecodeFourChar(UInt32 fc, std::string* out); 31 void DecodeFourChar(UInt32 fc, std::string* out);
29 32
30 enum MacOSVersionName { 33 enum MacOSVersionName {
31 kMacOSUnknown, // ??? 34 kMacOSUnknown, // ???
32 kMacOSOlder, // 10.2- 35 kMacOSOlder, // 10.2-
33 kMacOSPanther, // 10.3 36 kMacOSPanther, // 10.3
34 kMacOSTiger, // 10.4 37 kMacOSTiger, // 10.4
35 kMacOSLeopard, // 10.5 38 kMacOSLeopard, // 10.5
36 kMacOSSnowLeopard, // 10.6 39 kMacOSSnowLeopard, // 10.6
37 kMacOSLion, // 10.7 40 kMacOSLion, // 10.7
38 kMacOSMountainLion, // 10.8 41 kMacOSMountainLion, // 10.8
39 kMacOSMavericks, // 10.9 42 kMacOSMavericks, // 10.9
40 kMacOSNewer, // 10.10+ 43 kMacOSNewer, // 10.10+
41 }; 44 };
42 45
43 MacOSVersionName GetOSVersionName(); 46 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);
44 #endif 51 #endif
45 52
46 /////////////////////////////////////////////////////////////////////////////// 53 ///////////////////////////////////////////////////////////////////////////////
47 54
48 } // namespace rtc 55 } // namespace rtc
49 56
50 #endif // WEBRTC_BASE_MACUTILS_H__ 57 #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