diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 23:43:20 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 23:43:20 +0000 |
commit | 9432ade948544ddd1c0c982cc1201e06061e8bb3 (patch) | |
tree | 9c9c40c596e199cc738b2e09ad074f03f2e1b8c4 /base/xdg_util.cc | |
parent | 3a77e46f0b4616c4f2a33b76cdb0de75dfb8a5d5 (diff) | |
download | chromium_src-9432ade948544ddd1c0c982cc1201e06061e8bb3.zip chromium_src-9432ade948544ddd1c0c982cc1201e06061e8bb3.tar.gz chromium_src-9432ade948544ddd1c0c982cc1201e06061e8bb3.tar.bz2 |
base: rename Environment::HasEnv to Environment::HasVar.
This is the part 2 of this series. More two comming. Splitting this
into small parts, so it is more easy to review and reduce the size of the CL.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3035050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/xdg_util.cc')
-rw-r--r-- | base/xdg_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/xdg_util.cc b/base/xdg_util.cc index 426ef0e..6978986 100644 --- a/base/xdg_util.cc +++ b/base/xdg_util.cc @@ -39,7 +39,7 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) { return DESKTOP_ENVIRONMENT_KDE4; } else if (desktop_session == "kde") { // This may mean KDE4 on newer systems, so we have to check. - if (env->HasEnv("KDE_SESSION_VERSION")) + if (env->HasVar("KDE_SESSION_VERSION")) return DESKTOP_ENVIRONMENT_KDE4; return DESKTOP_ENVIRONMENT_KDE3; } else if (desktop_session.find("xfce") != std::string::npos) { @@ -49,10 +49,10 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) { // Fall back on some older environment variables. // Useful particularly in the DESKTOP_SESSION=default case. - if (env->HasEnv("GNOME_DESKTOP_SESSION_ID")) { + if (env->HasVar("GNOME_DESKTOP_SESSION_ID")) { return DESKTOP_ENVIRONMENT_GNOME; - } else if (env->HasEnv("KDE_FULL_SESSION")) { - if (env->HasEnv("KDE_SESSION_VERSION")) + } else if (env->HasVar("KDE_FULL_SESSION")) { + if (env->HasVar("KDE_SESSION_VERSION")) return DESKTOP_ENVIRONMENT_KDE4; return DESKTOP_ENVIRONMENT_KDE3; } |