aura: Make the Linux version of IconLoader not require GTK+.

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"
 
+#if defined(TOOLKIT_USES_GTK)

[willchan no longer on Chromium, 2011/11/10 21:24:14]

Unless it needs to be ordered this way, please move the platform specific
#include after all the other ones, a la
http://dev.chromium.org/developers/coding-style#TOC-Platform-defines.

[Daniel Erat, 2011/11/10 21:43:25]

Done.

 #include <gtk/gtk.h>
+#endif
 #include <sys/time.h>
 #include <time.h>
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
 
 #include "base/environment.h"
 #include "base/file_util.h"
@@ skipping 41 matching lines @@
   IconFormats icon_formats_;
 
   // Store loaded icon_theme.
   IconThemeMap icon_themes_;
 
   // The default theme.
   IconTheme* default_themes_[kDefaultThemeNum];
 
   time_t last_check_time_;
 
+#if defined(TOOLKIT_USES_GTK)
   // 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_;
+#endif
 
  private:
   MimeUtilConstants()
       : last_check_time_(0) {
     icon_formats_.push_back(".png");
     icon_formats_.push_back(".svg");
     icon_formats_.push_back(".xpm");
 
     for (size_t i = 0; i < kDefaultThemeNum; ++i)
       default_themes_[i] = NULL;
@@ skipping 417 matching lines @@
       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);
   } else {
+#if defined(TOOLKIT_USES_GTK)
     // Assume it's Gnome and use GTK to figure out the theme.
     default_themes[1] = IconTheme::LoadTheme(
         MimeUtilConstants::GetInstance()->gtk_theme_name_);
     default_themes[2] = IconTheme::LoadTheme("gnome");
+#endif
   }
   // 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 36 matching lines @@
   base::AutoLock scoped_lock(g_mime_util_xdg_lock.Get());
   return xdg_mime_get_mime_type_from_file_name(filepath.value().c_str());
 }
 
 std::string GetDataMimeType(const std::string& data) {
   base::ThreadRestrictions::AssertIOAllowed();
   base::AutoLock scoped_lock(g_mime_util_xdg_lock.Get());
   return xdg_mime_get_mime_type_for_data(data.data(), data.length(), NULL);
 }
 
+#if defined(TOOLKIT_USES_GTK)
 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 (!MimeUtilConstants::GetInstance()->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);
   MimeUtilConstants::GetInstance()->gtk_theme_name_.assign(gtk_theme_name);
   g_free(gtk_theme_name);
 }
+#endif
 
 FilePath GetMimeIcon(const std::string& mime_type, size_t size) {
   base::ThreadRestrictions::AssertIOAllowed();
   std::vector<std::string> icon_names;
   std::string icon_name;
   FilePath icon_file;
 
   {
     base::AutoLock scoped_lock(g_mime_util_xdg_lock.Get());
     const char *icon = xdg_mime_get_icon(mime_type.c_str());
@@ skipping 35 matching lines @@
     } else {
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace mime_util