summaryrefslogtreecommitdiffstats
path: root/base/nix
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 18:55:49 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 18:55:49 +0000
commitfb4bcfa38b2cdd740fd112fabeb5d45add27354b (patch)
treeae328c487cad94671d0788b3287cdd053f5d46a6 /base/nix
parent072b8d48705dc76cafa1aa8189f62a15c94aa7fb (diff)
downloadchromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.zip
chromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.tar.gz
chromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.tar.bz2
Move some more file utils to the base namespace.
This also swaps the order of the parameters to GetShmemTempDir so the out parameter is last, and enhances some documentation. Review URL: https://codereview.chromium.org/93263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/nix')
-rw-r--r--base/nix/mime_util_xdg.cc2
-rw-r--r--base/nix/xdg_util.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 1a41394..a5a97f4 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -414,7 +414,7 @@ void AddXDGDataDir(const FilePath& dir) {
// Add all the xdg icon directories.
void InitIconDir() {
- FilePath home = file_util::GetHomeDir();
+ FilePath home = GetHomeDir();
if (!home.empty()) {
FilePath legacy_data_dir(home);
legacy_data_dir = legacy_data_dir.AppendASCII(".icons");
diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
index b3caf2a..4c1510f 100644
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -31,7 +31,7 @@ FilePath GetXDGDirectory(Environment* env, const char* env_name,
if (env->GetVar(env_name, &env_value) && !env_value.empty())
path = FilePath(env_value);
else
- path = file_util::GetHomeDir().Append(fallback_dir);
+ path = GetHomeDir().Append(fallback_dir);
return path.StripTrailingSeparators();
}
@@ -42,7 +42,7 @@ FilePath GetXDGUserDirectory(const char* dir_name, const char* fallback_dir) {
path = FilePath(xdg_dir);
free(xdg_dir);
} else {
- path = file_util::GetHomeDir().Append(fallback_dir);
+ path = GetHomeDir().Append(fallback_dir);
}
return path.StripTrailingSeparators();
}