Linux: make the "change proxy settings" button able to start several proxy config utilities.

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 <stdlib.h>
 
 #include <vector>
 
@@ skipping 86 matching lines @@
 // static
 EnvironmentVariableGetter* EnvironmentVariableGetter::Create() {
   return new EnvironmentVariableGetterImpl();
 }
 
 DesktopEnvironment GetDesktopEnvironment(EnvironmentVariableGetter* env) {
   std::string desktop_session;
   if (env->Getenv("DESKTOP_SESSION", &desktop_session)) {
     if (desktop_session == "gnome")
       return DESKTOP_ENVIRONMENT_GNOME;
-    else if (desktop_session.substr(3) == "kde")  // kde3 or kde4
-      return DESKTOP_ENVIRONMENT_KDE;
+    else if (desktop_session == "kde4")
+      return DESKTOP_ENVIRONMENT_KDE4;
+    else if (desktop_session == "kde")
+      return DESKTOP_ENVIRONMENT_KDE3;
   }
 
   // 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)) {
-    return DESKTOP_ENVIRONMENT_KDE;
+    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";
+  }
+  return NULL;
+}
+
+const char* GetDesktopEnvironmentName(EnvironmentVariableGetter* env) {
+  return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
+}
+
 }  // namespace base