| Index: chrome/common/chrome_paths.cc
|
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
| index 79867cd50f8013a54c0a3307f1523e4e9fd4fbf9..eaf894f785010be824355dc1be0950a695af4dc0 100644
|
| --- a/chrome/common/chrome_paths.cc
|
| +++ b/chrome/common/chrome_paths.cc
|
| @@ -20,7 +20,7 @@
|
| #endif
|
|
|
| #if defined(OS_MACOSX)
|
| -#include "base/mac/mac_util.h"
|
| +#include "base/mac/foundation_util.h"
|
| #endif
|
|
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
| @@ -107,7 +107,7 @@ namespace chrome {
|
|
|
| // Gets the path for internal plugins.
|
| bool GetInternalPluginsDirectory(FilePath* result) {
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| // If called from Chrome, get internal plugins from a subdirectory of the
|
| // framework.
|
| if (base::mac::AmIBundled()) {
|
| @@ -346,7 +346,7 @@ bool PathProvider(int key, FilePath* result) {
|
| break;
|
| #endif
|
| case chrome::FILE_RESOURCES_PACK:
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| if (base::mac::AmIBundled()) {
|
| cur = base::mac::FrameworkBundlePath();
|
| cur = cur.Append(FILE_PATH_LITERAL("Resources"))
|
| @@ -418,7 +418,7 @@ bool PathProvider(int key, FilePath* result) {
|
| break;
|
| }
|
| #endif
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| case chrome::DIR_MANAGED_PREFS: {
|
| if (!GetLocalLibraryDirectory(&cur))
|
| return false;
|
| @@ -432,7 +432,7 @@ bool PathProvider(int key, FilePath* result) {
|
| break;
|
| }
|
| #endif
|
| -#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
|
| +#if defined(OS_CHROMEOS) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
| case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
| if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
|
| return false;
|
| @@ -447,7 +447,7 @@ bool PathProvider(int key, FilePath* result) {
|
| }
|
| #endif
|
| case chrome::DIR_EXTERNAL_EXTENSIONS:
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| if (!chrome::GetGlobalApplicationSupportDirectory(&cur))
|
| return false;
|
|
|
|
|