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_manager_linux.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_manager_linux.cc')
| -rw-r--r-- | chrome/browser/icon_manager_linux.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/icon_manager_linux.cc b/chrome/browser/icon_manager_linux.cc index 930320e..fc3cfa8 100644 --- a/chrome/browser/icon_manager_linux.cc +++ b/chrome/browser/icon_manager_linux.cc @@ -8,10 +8,6 @@ #include "base/threading/thread_restrictions.h" IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { -#if defined(USE_AURA) - // TODO(davemoore) Implement this for aura. - return std::string(); -#else // It turns out the call to mime_util::GetFileMimeType below does IO, but // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows // and Mac implementations do not). We should fix this by either not doing IO @@ -20,5 +16,4 @@ IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { base::ThreadRestrictions::ScopedAllowIO allow_io; return mime_util::GetFileMimeType(filepath); -#endif } |