From 3fd942adfefa160aa4c5ff27f5e4e3fef5776e1d Mon Sep 17 00:00:00 2001
From: "derat@chromium.org"
 <derat@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Thu, 10 Nov 2011 23:01:19 +0000
Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@109527 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common.gypi b/common.gypi
index 6f2d9d7cb..4c9487b40 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1278,11 +1278,16 @@
           }],
           ['toolkit_uses_gtk!=1', {
             'sources/': [
-              ['exclude', '_(gtk|xdg)(_unittest)?\\.(h|cc)$'],
+              ['exclude', '_gtk(_unittest)?\\.(h|cc)$'],
               ['exclude', '(^|/)gtk/'],
               ['exclude', '(^|/)gtk_[^/]*\\.(h|cc)$'],
             ],
           }],
+          ['OS!="linux"', {
+            'sources/': [
+              ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
+            ],
+          }],
           ['use_wayland!=1', {
             'sources/': [
               ['exclude', '_(wayland)(_unittest)?\\.(h|cc)$'],