Linux: Use the existing desktop environment detection code in mime_util_xdg.cc instead of its own...

base/mime_util_xdg.cc

 // Copyright (c) 2011 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/mime_util.h"
 
 #include <gtk/gtk.h>
 #include <sys/time.h>
 #include <time.h>
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
 
+#include "base/environment.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
+#include "base/nix/xdg_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/third_party/xdg_mime/xdgmime.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace {
 
 // None of the XDG stuff is thread-safe, so serialize all access under
 // this lock.
@@ skipping 446 matching lines @@
     }
   }
   return FilePath();
 }
 
 // Initialize the list of default themes.
 void InitDefaultThemes() {
   IconTheme** default_themes =
       MimeUtilConstants::GetInstance()->default_themes_;
 
-  char* env = getenv("KDE_FULL_SESSION");
-  if (env) {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  base::nix::DesktopEnvironment desktop_env =
+      base::nix::GetDesktopEnvironment(env.get());
+  if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
+      desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
     // KDE
     std::string kde_default_theme;
     std::string kde_fallback_theme;
 
     // TODO(thestig): Figure out how to get the current icon theme on KDE.
     // Setting stored in ~/.kde/share/config/kdeglobals under Icons -> Theme.
     default_themes[0] = NULL;
 
     // Try some reasonable defaults for KDE.
-    env = getenv("KDE_SESSION_VERSION");
-    if (!env || env[0] != '4') {
+    if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE3) {
       // KDE 3
       kde_default_theme = "default.kde";
       kde_fallback_theme = "crystalsvg";
     } else {
       // KDE 4
       kde_default_theme = "default.kde4";
       kde_fallback_theme = "oxygen";
     }
     default_themes[1] = IconTheme::LoadTheme(kde_default_theme);
     default_themes[2] = IconTheme::LoadTheme(kde_fallback_theme);
@@ skipping 97 matching lines @@
   icon_name = mime_type;
   for (size_t i = icon_name.find('/', 0); i != std::string::npos;
        i = icon_name.find('/', i + 1)) {
     icon_name[i] = '-';
   }
   icon_names.push_back(icon_name);
   // Also try gnome-mime-text-plain.
   icon_names.push_back("gnome-mime-" + icon_name);
 
   // Try "deb" for "application/x-deb" in KDE 3.
-  icon_name = mime_type.substr(mime_type.find("/x-") + 3);
-  icon_names.push_back(icon_name);
+  size_t x_substr_pos = mime_type.find("/x-");
+  if (x_substr_pos != std::string::npos) {

[willchan no longer on Chromium, 2011/11/01 20:54:49]

This is a new change that isn't explained by the changelist description. Can you
explain why this is necessary? It seems reasonable at a glance, I just want to
doublecheck.

[Lei Zhang, 2011/11/01 21:03:29]

This is the "Also fix a case where we look up bad icon names" part.

For a mime type of "application/x-deb", we try to look up an icon with the name
"deb". However, if the input mime type doesn't have "/x-", e.g. "image/png",
right now we try to look up a bad icon name.

[willchan no longer on Chromium, 2011/11/01 21:04:15]

Sorry, I missed that. Explanation sounds great.

+    icon_name = mime_type.substr(x_substr_pos + 3);
+    icon_names.push_back(icon_name);
+  }
 
   // Try generic name like text-x-generic.
   icon_name = mime_type.substr(0, mime_type.find('/')) + "-x-generic";
   icon_names.push_back(icon_name);
 
   // Last resort
   icon_names.push_back("unknown");
 
   for (size_t i = 0; i < icon_names.size(); i++) {
     if (icon_names[i][0] == '/') {
       icon_file = FilePath(icon_names[i]);
       if (file_util::PathExists(icon_file))
         return icon_file;
     } else {
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace mime_util