linux: generalize desktop environment guessing to encompass KDE

BUG=17363

Review URL: http://codereview.chromium.org/159297

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21455 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 30 insertions, 13 deletions

diff --git a/base/linux_util.cc b/base/linux_util.cc
index bc99d44..259899f 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -99,14 +99,25 @@ EnvironmentVariableGetter* EnvironmentVariableGetter::Create() {
   return new EnvironmentVariableGetterImpl();
 }
 
-bool UseGnomeForSettings(EnvironmentVariableGetter* env_var_getter) {
-  // GNOME_DESKTOP_SESSION_ID being defined is a good indication that
-  // we are probably running under GNOME.
-  // Note: KDE_FULL_SESSION is a corresponding env var to recognize KDE.
-  std::string dummy, desktop_session;
-  return env_var_getter->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy)
-      || (env_var_getter->Getenv("DESKTOP_SESSION", &desktop_session)
-          && desktop_session == "gnome");
+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;
+  }
+
+  // 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;
+  }
+
+  return DESKTOP_ENVIRONMENT_OTHER;
 }
 
 }  // namespace base
diff --git a/base/linux_util.h b/base/linux_util.h
index 5a46481..693377c 100644
--- a/base/linux_util.h
+++ b/base/linux_util.h
@@ -32,11 +32,17 @@ class EnvironmentVariableGetter {
   static EnvironmentVariableGetter* Create();
 };
 
-// Return true if we appear to be running under Gnome and should attempt to use
-// some prefrences from the desktop environment (eg proxy settings),
-// If someone adds support for other environments, this function could be
-// replaced with one that returns an enum so we an specify Gnome, KDE, etc.
-bool UseGnomeForSettings(EnvironmentVariableGetter* env_var_getter);
+enum DesktopEnvironment {
+  DESKTOP_ENVIRONMENT_OTHER,
+  DESKTOP_ENVIRONMENT_GNOME,
+  DESKTOP_ENVIRONMENT_KDE,
+};
+
+// 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);
 
 }  // namespace base