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

base/linux_util.h

 // 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.
 
 #ifndef BASE_LINUX_UTIL_H__
 #define BASE_LINUX_UTIL_H__
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 17 matching lines @@
   // result. Returns false if the key is unset.
   virtual bool Getenv(const char* variable_name, std::string* result) = 0;
 
   // Create an instance of EnvironmentVariableGetter
   static EnvironmentVariableGetter* Create();
 };
 
 enum DesktopEnvironment {
   DESKTOP_ENVIRONMENT_OTHER,
   DESKTOP_ENVIRONMENT_GNOME,
-  DESKTOP_ENVIRONMENT_KDE,
+  // KDE3 and KDE4 are sufficiently different that we count
+  // them as two different desktop environments here.
+  DESKTOP_ENVIRONMENT_KDE3,
+  DESKTOP_ENVIRONMENT_KDE4,
 };
 
 // Return an entry from the DesktopEnvironment enum with a best guess
 // of which desktop environment we're using.  We use this to know when
 // to attempt to use preferences from the desktop environment --
 // proxy settings, password manager, etc.
 DesktopEnvironment GetDesktopEnvironment(EnvironmentVariableGetter* env);
 
+// Return a string representation of the given desktop environment.
+// May return NULL in the case of DESKTOP_ENVIRONMENT_OTHER.
+const char* GetDesktopEnvironmentName(DesktopEnvironment env);
+// Convenience wrapper that calls GetDesktopEnvironment() first.
+const char* GetDesktopEnvironmentName(EnvironmentVariableGetter* env);
+
 }  // namespace base
 
 #endif  // BASE_LINUX_UTIL_H__