Linux: Detect Unity as a desktop environment.

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/environment.h"
 #include "base/file_path.h"
@@ skipping 30 matching lines @@
   if (xdg_dir) {
     path = FilePath(xdg_dir);
     free(xdg_dir);
   } else {
     path = file_util::GetHomeDir().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") {
+      return DESKTOP_ENVIRONMENT_UNITY;
+    } else if (xdg_current_desktop == "GNOME") {
+      return DESKTOP_ENVIRONMENT_GNOME;
+    }

[Mike Mammarella, 2012/07/12 01:15:55]

Looks like in this file we leave these {} off when possible, like here.

[Lei Zhang, 2012/07/12 02:27:02]

Done.

+  }
+
+  // DESKTOP_SESSION was what everyone used in 2010.
   std::string desktop_session;
   if (env->GetVar("DESKTOP_SESSION", &desktop_session)) {
     if (desktop_session == "gnome") {
       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.
       if (env->HasVar(kKDE4SessionEnvVar))
         return DESKTOP_ENVIRONMENT_KDE4;
@@ skipping 20 matching lines @@
 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_UNITY:
+      return "UNITY";
     case DESKTOP_ENVIRONMENT_XFCE:
       return "XFCE";
   }
   return NULL;
 }
 
 const char* GetDesktopEnvironmentName(Environment* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }
 
 }  // namespace nix
 }  // namespace base