Index: base/mac/foundation_util.mm |
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm |
index 13c6ee807802f78d26bf4a7f0e07d410d9ada1e0..8ef5ca3b528f93dc5b5a6ba897ef3d436825b38e 100644 |
--- a/base/mac/foundation_util.mm |
+++ b/base/mac/foundation_util.mm |
@@ -13,10 +13,12 @@ |
#include "base/mac/mac_logging.h" |
#include "base/sys_string_conversions.h" |
+#if !defined(OS_IOS) |
extern "C" { |
CFTypeID SecACLGetTypeID(); |
CFTypeID SecTrustedApplicationGetTypeID(); |
} // extern "C" |
+#endif |
namespace base { |
namespace mac { |
@@ -29,6 +31,10 @@ static bool UncachedAmIBundled() { |
if (g_override_am_i_bundled) |
return g_override_am_i_bundled_value; |
+#if defined(OS_IOS) |
Mark Mentovai
2012/07/11 14:04:22
Uh-oh, your changes are colliding…
|
+ // All apps are bundled on iOS |
+ return true; |
+#else |
ProcessSerialNumber psn = {0, kCurrentProcess}; |
FSRef fsref; |
@@ -47,6 +53,7 @@ static bool UncachedAmIBundled() { |
} |
return info.nodeFlags & kFSNodeIsDirectoryMask; |
+#endif |
} |
bool AmIBundled() { |
@@ -317,8 +324,10 @@ CF_CAST_DEFN(CFNumber); |
CF_CAST_DEFN(CFSet); |
CF_CAST_DEFN(CFString); |
+#if !defined(OS_IOS) |
CF_CAST_DEFN(SecACL); |
CF_CAST_DEFN(SecTrustedApplication); |
+#endif |
#undef CF_CAST_DEFN |