Move gtk_settings_get_default() call to the UI thread.

base/mime_util_linux.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/mime_util.h"
 
 #include <gtk/gtk.h>
 #include <sys/time.h>
 #include <time.h>
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/third_party/xdg_mime/xdgmime.h"
 
 namespace {
 
 class IconTheme;
 
 class MimeUtilConstants {
@@ skipping 11 matching lines @@
   // Store loaded icon_theme.
   std::map<std::string, IconTheme*>* icon_themes_;
 
   static const size_t kDefaultThemeNum = 4;
 
   // The default theme.
   IconTheme* default_themes_[kDefaultThemeNum];
 
   time_t last_check_time_;
 
+  // This is set by DetectGtkTheme(). We cache it so that we can access the
+  // theme name from threads that aren't allowed to call
+  // gtk_settings_get_default().
+  std::string gtk_theme_name_;
+
  private:
   MimeUtilConstants()
       : kUpdateInterval(5),
         icon_dirs_(NULL),
         icon_themes_(NULL),
         last_check_time_(0) {
     icon_formats_.push_back(".png");
     icon_formats_.push_back(".svg");
     icon_formats_.push_back(".xpm");
 
@@ skipping 423 matching lines @@
       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);
   } else {
     // Assume it's Gnome and use GTK to figure out the theme.
-    gchar* gtk_theme_name;
-    g_object_get(gtk_settings_get_default(),
-                 "gtk-icon-theme-name",
-                 &gtk_theme_name, NULL);
-    default_themes[1] = IconTheme::LoadTheme(gtk_theme_name);
+    default_themes[1] = IconTheme::LoadTheme(
+        Singleton<MimeUtilConstants>::get()->gtk_theme_name_);
     default_themes[2] = IconTheme::LoadTheme("gnome");
-    g_free(gtk_theme_name);
   }
   // hicolor needs to be last per icon theme spec.
   default_themes[3] = IconTheme::LoadTheme("hicolor");
 
   for (size_t i = 0; i < MimeUtilConstants::kDefaultThemeNum; i++) {
     if (default_themes[i] == NULL)
       continue;
     // NULL out duplicate pointers.
     for (size_t j = i + 1; j < MimeUtilConstants::kDefaultThemeNum; j++) {
       if (default_themes[j] == default_themes[i])
@@ skipping 34 matching lines @@
 namespace mime_util {
 
 std::string GetFileMimeType(const FilePath& filepath) {
   return xdg_mime_get_mime_type_from_file_name(filepath.value().c_str());
 }
 
 std::string GetDataMimeType(const std::string& data) {
   return xdg_mime_get_mime_type_for_data(data.data(), data.length(), NULL);
 }
 
+void DetectGtkTheme() {
+  // If the theme name is already loaded, do nothing. Chrome doesn't respond
+  // to changes in the system theme, so we never need to set this more than
+  // once.
+  if (!Singleton<MimeUtilConstants>::get()->gtk_theme_name_.empty())
+    return;
+
+  // We should only be called on the UI thread.
+  DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
+
+  gchar* gtk_theme_name;
+  g_object_get(gtk_settings_get_default(),
+               "gtk-icon-theme-name",
+               &gtk_theme_name, NULL);
+  Singleton<MimeUtilConstants>::get()->gtk_theme_name_.assign(gtk_theme_name);
+  g_free(gtk_theme_name);
+}
+
 FilePath GetMimeIcon(const std::string& mime_type, size_t size) {
   std::vector<std::string> icon_names;
   std::string icon_name;
   FilePath icon_file;
 
   const char* icon = xdg_mime_get_icon(mime_type.c_str());
   icon_name = std::string(icon ? icon : "");
   if (icon_name.length())
     icon_names.push_back(icon_name);
 
@@ skipping 26 matching lines @@
     } else {
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace mime_util