summaryrefslogtreecommitdiffstats
path: root/base/nix
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:31:39 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:31:39 +0000
commit926246834b9dba6fd85516c6a5fe834b6a801c79 (patch)
treef5359293b74803b7c6e9be6cc32b11b6a21921b9 /base/nix
parentf0bc50e546b3beacc7d497da284bb1cda9c26901 (diff)
downloadchromium_src-926246834b9dba6fd85516c6a5fe834b6a801c79.zip
chromium_src-926246834b9dba6fd85516c6a5fe834b6a801c79.tar.gz
chromium_src-926246834b9dba6fd85516c6a5fe834b6a801c79.tar.bz2
Ubuntu: Detect "xubuntu" as DESKTOP_SESSION.
BUG=none TEST=On xubuntu lucid, actually detect that we're running xfce. Review URL: http://codereview.chromium.org/6612056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/nix')
-rw-r--r--base/nix/xdg_util.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
index b39a07d..f824618 100644
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -43,7 +43,8 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) {
if (env->HasVar("KDE_SESSION_VERSION"))
return DESKTOP_ENVIRONMENT_KDE4;
return DESKTOP_ENVIRONMENT_KDE3;
- } else if (desktop_session.find("xfce") != std::string::npos) {
+ } else if (desktop_session.find("xfce") != std::string::npos ||
+ desktop_session == "xubuntu") {
return DESKTOP_ENVIRONMENT_XFCE;
}
}