linux: generalize desktop environment guessing to encompass KDE

chrome/browser/gtk/options/advanced_contents_gtk.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 "chrome/browser/gtk/options/advanced_contents_gtk.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include "app/l10n_util.h"
@@ skipping 284 matching lines @@
                      FALSE, FALSE, 0);
 }
 
 // static
 void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
                                                   NetworkSection* section) {
   section->UserMetricsRecordAction(L"Options_ChangeProxies", NULL);
 
   scoped_ptr<base::EnvironmentVariableGetter> env_getter(
       base::EnvironmentVariableGetter::Create());
-  if (base::UseGnomeForSettings(env_getter.get())) {
-    std::vector<std::string> argv;
-    argv.push_back(kProxyConfigBinary);
-    base::file_handle_mapping_vector no_files;
-    base::environment_vector env;
-    base::ProcessHandle handle;
-    env.push_back(std::make_pair("GTK_PATH",
-                                 getenv("CHROMIUM_SAVED_GTK_PATH")));
-    if (!base::LaunchApp(argv, env, no_files, false, &handle)) {
-      LOG(ERROR) << "OpenProxyConfigDialogTask failed";
-      return;
+
+  switch (base::GetDesktopEnvironment(env_getter.get())) {
+    case base::DESKTOP_ENVIRONMENT_GNOME: {
+      std::vector<std::string> argv;
+      argv.push_back(kProxyConfigBinary);
+      base::file_handle_mapping_vector no_files;
+      base::environment_vector env;
+      base::ProcessHandle handle;
+      env.push_back(std::make_pair("GTK_PATH",
+                                   getenv("CHROMIUM_SAVED_GTK_PATH")));
+      if (!base::LaunchApp(argv, env, no_files, false, &handle)) {
+        LOG(ERROR) << "OpenProxyConfigDialogTask failed";
+        return;
+      }
+      ProcessWatcher::EnsureProcessGetsReaped(handle);
+      break;
     }
-    ProcessWatcher::EnsureProcessGetsReaped(handle);
-  } else {
-    BrowserList::GetLastActive()->
-        OpenURL(GURL(l10n_util::GetStringUTF8(IDS_LINUX_PROXY_CONFIG_URL)),
-                GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+
+    case base::DESKTOP_ENVIRONMENT_KDE:
+      NOTIMPLEMENTED() << "Bug 17363: obey KDE proxy settings.";
+      // Fall through to default behavior for now.
+
+    case base::DESKTOP_ENVIRONMENT_OTHER:
+      BrowserList::GetLastActive()->
+          OpenURL(GURL(l10n_util::GetStringUTF8(IDS_LINUX_PROXY_CONFIG_URL)),
+                  GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+      break;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PrivacySection
 
 class PrivacySection : public OptionsPageBase {
  public:
   explicit PrivacySection(Profile* profile);
   virtual ~PrivacySection() {}
@@ skipping 507 matching lines @@
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
       web_content_section_->get_page_widget(), false);
 
   security_section_.reset(new SecuritySection(profile_));
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
       security_section_->get_page_widget(), false);
 
   page_ = options_builder.get_page_widget();
 }