More linux ifdef tweaks. This reverts my earlier change (13503)....

chrome/common/resource_bundle_linux.cc

Index: chrome/common/resource_bundle_linux.cc
===================================================================
--- chrome/common/resource_bundle_linux.cc	(revision 14606)
+++ chrome/common/resource_bundle_linux.cc	(working copy)
@@ -4,9 +4,7 @@
 
 #include "chrome/common/resource_bundle.h"
 
-#if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
-#endif
 
 #include "base/base_paths.h"
 #include "base/data_pack.h"
@@ -25,7 +23,6 @@
 
 namespace {
 
-#if defined(TOOLKIT_GTK)
 // Convert the raw image data into a GdkPixbuf.  The GdkPixbuf that is returned
 // has a ref count of 1 so the caller must call g_object_unref to free the
 // memory.
@@ -51,7 +48,6 @@
 
   return pixbuf;
 }
-#endif
 
 }  // namespace
 
@@ -163,7 +159,6 @@
   return msg;
 }
 
-#if defined(TOOLKIT_GTK)
 GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) {
   // Check to see if we already have the pixbuf in the cache.
   {
@@ -212,4 +207,3 @@
     return empty_bitmap;
   }
 }
-#endif