GTK: Improve xfce detection.

base/linux_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/linux_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <glib.h>
 #include <stdlib.h>
@@ skipping 211 matching lines @@
     FilePath rv(xdg_dir);
     free(xdg_dir);
     return rv;
   }
   return GetHomeDir(env).Append(fallback_dir);
 }
 
 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.find("xfce") != std::string::npos) {
+      return DESKTOP_ENVIRONMENT_XFCE;
     }
-    else if (desktop_session == "xfce4")
-      return DESKTOP_ENVIRONMENT_XFCE;
   }
 
   // Fall back on some older environment variables.
   // Useful particularly in the DESKTOP_SESSION=default case.
   if (env->HasEnv("GNOME_DESKTOP_SESSION_ID")) {
     return DESKTOP_ENVIRONMENT_GNOME;
   } else if (env->HasEnv("KDE_FULL_SESSION")) {
     if (env->HasEnv("KDE_SESSION_VERSION"))
       return DESKTOP_ENVIRONMENT_KDE4;
     return DESKTOP_ENVIRONMENT_KDE3;
@@ skipping 88 matching lines @@
       }
     }
 
     closedir(fd);
   }
 
   return already_found;
 }
 
 }  // namespace base