diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:01:19 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:01:19 +0000 |
| commit | 3ce52b7367e007940d7ab34ae8eae1df236c59df (patch) | |
| tree | 47f5613516962fab4f194fe71301f893bfc0b30f /base/mime_util.h | |
| parent | f5f2b838a077645b6ff97a995c98906e314304d5 (diff) | |
| download | chromium_src-3ce52b7367e007940d7ab34ae8eae1df236c59df.zip chromium_src-3ce52b7367e007940d7ab34ae8eae1df236c59df.tar.gz chromium_src-3ce52b7367e007940d7ab34ae8eae1df236c59df.tar.bz2 | |
aura: Make the Linux version of IconLoader not require GTK+.
This change makes it use webkit_glue::ImageDecoder instead
of gdk-pixbuf and hides various GTK+ theme-related code
behind TOOLKIT_USES_GTK ifdefs. Chrome OS is currently
loading its own icons from resources (see r86936 and
http://crosbug.com/129) instead of using IconLoader and
IconManager, so this only removes NOTIMPLEMENTED()s on
non-Chrome-OS Linux Aura builds (along with simplifying the
GTK+ version of the code).
BUG=99494
TEST=manual: download icons are still visible on a gtk+ build
Review URL: http://codereview.chromium.org/8501030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mime_util.h')
| -rw-r--r-- | base/mime_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/mime_util.h b/base/mime_util.h index fd862ed..7af0472 100644 --- a/base/mime_util.h +++ b/base/mime_util.h @@ -24,7 +24,7 @@ BASE_EXPORT std::string GetFileMimeType(const FilePath& filepath); // Get the mime type for a byte vector. BASE_EXPORT std::string GetDataMimeType(const std::string& data); -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) // This detects the current GTK theme by calling gtk_settings_get_default(). // It should only be executed on the UI thread and must be called before // GetMimeIcon(). |