diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 03:00:50 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 03:00:50 +0000 |
commit | 76b90d310def447b7b5f10d92a69813308150778 (patch) | |
tree | 24c61fdccf94360913bfa8f7ac67c24a27bcfb38 /base/xdg_util.cc | |
parent | 7f2a9dbe56bfa6189271af808c53ccaee193a961 (diff) | |
download | chromium_src-76b90d310def447b7b5f10d92a69813308150778.zip chromium_src-76b90d310def447b7b5f10d92a69813308150778.tar.gz chromium_src-76b90d310def447b7b5f10d92a69813308150778.tar.bz2 |
base: Rename EnvVarGetter to Environment.
Now EnvVarGetter do much more than getting environment variables.
Per suggestion from Pawel in http://codereview.chromium.org/3043018/.
BUG=None
TEST=trybots
Signed-off-by: Thiago Farina <tfarina@chromium.org>
Review URL: http://codereview.chromium.org/3052034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/xdg_util.cc')
-rw-r--r-- | base/xdg_util.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/xdg_util.cc b/base/xdg_util.cc index 0ff6c47..426ef0e 100644 --- a/base/xdg_util.cc +++ b/base/xdg_util.cc @@ -4,14 +4,14 @@ #include "base/xdg_util.h" -#include "base/env_var.h" +#include "base/environment.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.h" namespace base { -FilePath GetXDGDirectory(EnvVarGetter* env, const char* env_name, +FilePath GetXDGDirectory(Environment* env, const char* env_name, const char* fallback_dir) { std::string env_value; if (env->GetEnv(env_name, &env_value) && !env_value.empty()) @@ -19,7 +19,7 @@ FilePath GetXDGDirectory(EnvVarGetter* env, const char* env_name, return file_util::GetHomeDir().Append(fallback_dir); } -FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name, +FilePath GetXDGUserDirectory(Environment* env, const char* dir_name, const char* fallback_dir) { char* xdg_dir = xdg_user_dir_lookup(dir_name); if (xdg_dir) { @@ -30,7 +30,7 @@ FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name, return file_util::GetHomeDir().Append(fallback_dir); } -DesktopEnvironment GetDesktopEnvironment(EnvVarGetter* env) { +DesktopEnvironment GetDesktopEnvironment(Environment* env) { std::string desktop_session; if (env->GetEnv("DESKTOP_SESSION", &desktop_session)) { if (desktop_session == "gnome") { @@ -76,7 +76,7 @@ const char* GetDesktopEnvironmentName(DesktopEnvironment env) { return NULL; } -const char* GetDesktopEnvironmentName(EnvVarGetter* env) { +const char* GetDesktopEnvironmentName(Environment* env) { return GetDesktopEnvironmentName(GetDesktopEnvironment(env)); } |