GTK: Turn on the GTK+ integration by default.

base/linux_util.cc

 // Copyright (c) 2009 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 256 matching lines @@
       return DESKTOP_ENVIRONMENT_GNOME;
     else if (desktop_session == "kde4")
       return DESKTOP_ENVIRONMENT_KDE4;
     else if (desktop_session == "kde") {
       // This may mean KDE4 on newer systems, so we have to check.
       std::string dummy;
       if (env->Getenv("KDE_SESSION_VERSION", &dummy))
         return DESKTOP_ENVIRONMENT_KDE4;
       return DESKTOP_ENVIRONMENT_KDE3;
     }
+    else if (desktop_session == "xfce4")
+      return DESKTOP_ENVIRONMENT_XFCE;
   }
 
   // Fall back on some older environment variables.
   // Useful particularly in the DESKTOP_SESSION=default case.
   std::string dummy;
   if (env->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy)) {
     return DESKTOP_ENVIRONMENT_GNOME;
   } else if (env->Getenv("KDE_FULL_SESSION", &dummy)) {
     if (env->Getenv("KDE_SESSION_VERSION", &dummy))
       return DESKTOP_ENVIRONMENT_KDE4;
     return DESKTOP_ENVIRONMENT_KDE3;
   }
 
   return DESKTOP_ENVIRONMENT_OTHER;
 }
 
 const char* GetDesktopEnvironmentName(DesktopEnvironment env) {
   switch (env) {
     case DESKTOP_ENVIRONMENT_OTHER:
       return NULL;
     case DESKTOP_ENVIRONMENT_GNOME:
       return "GNOME";
     case DESKTOP_ENVIRONMENT_KDE3:
       return "KDE3";
     case DESKTOP_ENVIRONMENT_KDE4:
       return "KDE4";
+    case DESKTOP_ENVIRONMENT_XFCE:
+      return "XFCE";
   }
   return NULL;
 }
 
 const char* GetDesktopEnvironmentName(EnvironmentVariableGetter* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }
 
 bool FileDescriptorGetInode(ino_t* inode_out, int fd) {
   DCHECK(inode_out);
@@ skipping 61 matching lines @@
       }
     }
 
     closedir(fd);
   }
 
   return already_found;
 }
 
 }  // namespace base