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

Unified Diff: chrome/common/chrome_paths.cc

Issue 11418005: Get a minimal unit_tests target building and running for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@chrome-gyp-ios-support
Patch Set: Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 79867cd50f8013a54c0a3307f1523e4e9fd4fbf9..7ed9186e29db70975fdef9ec0c45a53c0a0adbdd 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: {
Nico 2012/11/15 18:01:33 This constant only exists if defined(OS_MACOSX), s
stuartmorgan 2012/11/15 18:23:11 Good point. I'll do a sweep tomorrow on the header
if (!GetLocalLibraryDirectory(&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;

Powered by Google App Engine
This is Rietveld 408576698