Roll Chrome into Mojo.

base/nix/xdg_util.cc

 // Copyright (c) 2012 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/nix/xdg_util.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/environment.h"
@@ skipping 15 matching lines @@
 const char kDotConfigDir[] = ".config";
 const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
 
 FilePath GetXDGDirectory(Environment* env, const char* env_name,
                          const char* fallback_dir) {
   FilePath path;
   std::string env_value;
   if (env->GetVar(env_name, &env_value) && !env_value.empty()) {
     path = FilePath(env_value);
   } else {
-    PathService::Get(base::DIR_HOME, &path);
+    PathService::Get(DIR_HOME, &path);
     path = path.Append(fallback_dir);
   }
   return path.StripTrailingSeparators();
 }
 
 FilePath GetXDGUserDirectory(const char* dir_name, const char* fallback_dir) {
   FilePath path;
   char* xdg_dir = xdg_user_dir_lookup(dir_name);
   if (xdg_dir) {
     path = FilePath(xdg_dir);
     free(xdg_dir);
   } else {
-    PathService::Get(base::DIR_HOME, &path);
+    PathService::Get(DIR_HOME, &path);
     path = path.Append(fallback_dir);
   }
   return path.StripTrailingSeparators();
 }
 
 DesktopEnvironment GetDesktopEnvironment(Environment* env) {
   // XDG_CURRENT_DESKTOP is the newest standard circa 2012.
   std::string xdg_current_desktop;
   if (env->GetVar("XDG_CURRENT_DESKTOP", &xdg_current_desktop)) {
     // Not all desktop environments set this env var as of this writing.
     if (xdg_current_desktop == "Unity") {
       // gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
       // DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
       std::string desktop_session;
       if (env->GetVar("DESKTOP_SESSION", &desktop_session) &&
           desktop_session.find("gnome-fallback") != std::string::npos) {
         return DESKTOP_ENVIRONMENT_GNOME;
       }
       return DESKTOP_ENVIRONMENT_UNITY;
     } else if (xdg_current_desktop == "GNOME") {
       return DESKTOP_ENVIRONMENT_GNOME;
+    } else if (xdg_current_desktop == "KDE") {
+      return DESKTOP_ENVIRONMENT_KDE4;
     }
   }
 
   // DESKTOP_SESSION was what everyone used in 2010.
   std::string desktop_session;
   if (env->GetVar("DESKTOP_SESSION", &desktop_session)) {
-    if (desktop_session == "gnome") {
+    if (desktop_session == "gnome" || desktop_session =="mate") {
       return DESKTOP_ENVIRONMENT_GNOME;
-    } else if (desktop_session == "kde4") {
+    } else if (desktop_session == "kde4" || desktop_session == "kde-plasma") {
       return DESKTOP_ENVIRONMENT_KDE4;
     } else if (desktop_session == "kde") {
       // This may mean KDE4 on newer systems, so we have to check.
       if (env->HasVar(kKDE4SessionEnvVar))
         return DESKTOP_ENVIRONMENT_KDE4;
       return DESKTOP_ENVIRONMENT_KDE3;
     } else if (desktop_session.find("xfce") != std::string::npos ||
                desktop_session == "xubuntu") {
       return DESKTOP_ENVIRONMENT_XFCE;
     }
@@ skipping 29 matching lines @@
   }
   return NULL;
 }
 
 const char* GetDesktopEnvironmentName(Environment* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }
 
 }  // namespace nix
 }  // namespace base