GTK: Improve xfce detection.

base/linux_util.cc

Index: base/linux_util.cc
diff --git a/base/linux_util.cc b/base/linux_util.cc
index b552b931d3f143775854e9657b02810457b303ab..6197bc3fb89c8f51a15adf20df5d636e377db4cb 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -229,18 +229,18 @@ FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name,
 DesktopEnvironment GetDesktopEnvironment(EnvVarGetter* env) {
   std::string desktop_session;
   if (env->GetEnv("DESKTOP_SESSION", &desktop_session)) {
-    if (desktop_session == "gnome")
+    if (desktop_session == "gnome") {
       return DESKTOP_ENVIRONMENT_GNOME;
-    else if (desktop_session == "kde4")
+    } else if (desktop_session == "kde4") {
       return DESKTOP_ENVIRONMENT_KDE4;
-    else if (desktop_session == "kde") {
+    } else if (desktop_session == "kde") {
       // This may mean KDE4 on newer systems, so we have to check.
       if (env->HasEnv("KDE_SESSION_VERSION"))
         return DESKTOP_ENVIRONMENT_KDE4;

[Evan Martin, 2010/04/15 19:31:00]

I wonder if this means we break on KDE5.  (Please don't let this comment deter
you from committing.)

       return DESKTOP_ENVIRONMENT_KDE3;
-    }
-    else if (desktop_session == "xfce4")
+    } else if (desktop_session.find("xfce") != std::string::npos) {
       return DESKTOP_ENVIRONMENT_XFCE;
+    }
   }
 
   // Fall back on some older environment variables.