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

Unified Diff: base/file_util_posix.cc

Issue 69953025: Support use_glib==0 on Linux in base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: bring back EXPECT_EQ as it suppresses unused result warning Created 7 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
« no previous file with comments | « no previous file | base/process/memory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_util_posix.cc
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index a2dd19b97c439bd9a406af09526b6b1947b4e726..134935c271774c6511ac66fc83fd312fc1c0e1c7 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -24,7 +24,7 @@
#if defined(OS_MACOSX)
#include <AvailabilityMacros.h>
#include "base/mac/foundation_util.h"
-#elif !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#elif !defined(OS_CHROMEOS) && defined(USE_GLIB)
#include <glib.h> // for g_get_home_dir()
#endif
@@ -778,7 +778,7 @@ FilePath GetHomeDir() {
#if defined(OS_ANDROID)
DLOG(WARNING) << "OS_ANDROID: Home directory lookup not yet implemented.";
-#elif !defined(OS_CHROMEOS)
+#elif defined(USE_GLIB) && !defined(OS_CHROMEOS)
// g_get_home_dir calls getpwent, which can fall through to LDAP calls.
base::ThreadRestrictions::AssertIOAllowed();
« no previous file with comments | « no previous file | base/process/memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698