Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3044)

Unified Diff: base/nix/mime_util_xdg.cc

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/nix/mime_util_xdg.h ('k') | base/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/nix/mime_util_xdg.cc
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 6cd5945d51a11dcfd688bb4a74aa74a25fa18cbc..030c30c11f6559361aed3757461a2d89d4268b95 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -23,7 +23,7 @@
#include "base/threading/thread_restrictions.h"
#include "base/time.h"
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h> // NOLINT
#include "base/message_loop.h"
@@ -67,7 +67,7 @@ class MimeUtilConstants {
base::TimeTicks last_check_time_;
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_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().
@@ -536,7 +536,7 @@ void InitDefaultThemes() {
default_themes[1] = IconTheme::LoadTheme(kde_default_theme);
default_themes[2] = IconTheme::LoadTheme(kde_fallback_theme);
} else {
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
// Assume it's Gnome and use GTK to figure out the theme.
default_themes[1] = IconTheme::LoadTheme(
MimeUtilConstants::GetInstance()->gtk_theme_name_);
@@ -599,7 +599,7 @@ std::string GetDataMimeType(const std::string& data) {
return xdg_mime_get_mime_type_for_data(data.data(), data.length(), NULL);
}
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_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
« no previous file with comments | « base/nix/mime_util_xdg.h ('k') | base/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698