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 /chrome/browser/icon_loader.cc | |
| 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 'chrome/browser/icon_loader.cc')
| -rw-r--r-- | chrome/browser/icon_loader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 9670551..20904b5 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -8,7 +8,7 @@ #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) #include "base/mime_util.h" #endif @@ -29,7 +29,7 @@ IconLoader::~IconLoader() { void IconLoader::Start() { target_message_loop_ = base::MessageLoopProxy::current(); -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) // This call must happen on the UI thread before we can start loading icons. mime_util::DetectGtkTheme(); #endif |