Linux: Detect Unity as a desktop environment.

base/nix/xdg_util.cc

Index: base/nix/xdg_util.cc
===================================================================
--- base/nix/xdg_util.cc	(revision 146030)
+++ base/nix/xdg_util.cc	(working copy)
@@ -48,6 +48,18 @@
 }
 
 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") {
@@ -88,6 +100,8 @@
       return "KDE3";
     case DESKTOP_ENVIRONMENT_KDE4:
       return "KDE4";
+    case DESKTOP_ENVIRONMENT_UNITY:
+      return "UNITY";
     case DESKTOP_ENVIRONMENT_XFCE:
       return "XFCE";
   }