| Index: base/mac/foundation_util.mm
|
| diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
|
| index 13c6ee807802f78d26bf4a7f0e07d410d9ada1e0..729061518719d256e5584657af75a1fc37a3ecdf 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 {
|
| @@ -26,6 +28,10 @@ static bool g_override_am_i_bundled_value = false;
|
|
|
| // Adapted from http://developer.apple.com/carbon/tipsandtricks.html#AmIBundled
|
| static bool UncachedAmIBundled() {
|
| +#if defined(OS_IOS)
|
| + // All apps are bundled on iOS
|
| + return true;
|
| +#else
|
| if (g_override_am_i_bundled)
|
| return g_override_am_i_bundled_value;
|
|
|
| @@ -47,6 +53,7 @@ static bool UncachedAmIBundled() {
|
| }
|
|
|
| return info.nodeFlags & kFSNodeIsDirectoryMask;
|
| +#endif
|
| }
|
|
|
| bool AmIBundled() {
|
| @@ -62,6 +69,11 @@ bool AmIBundled() {
|
| }
|
|
|
| void SetOverrideAmIBundled(bool value) {
|
| +#if defined(OS_IOS)
|
| + // It doesn't make sense not to be bundled on iOS.
|
| + if (!value)
|
| + NOTREACHED();
|
| +#endif
|
| g_override_am_i_bundled = true;
|
| g_override_am_i_bundled_value = value;
|
| }
|
| @@ -317,8 +329,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
|
|
|
|
|