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

chrome/common/resource_bundle_linux.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/l10n_util.h"
 #include "SkBitmap.h"
 
 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.
 GdkPixbuf* LoadPixbuf(std::vector<unsigned char>& data) {
   ScopedGObject<GdkPixbufLoader>::Type loader(gdk_pixbuf_loader_new());
   bool ok = gdk_pixbuf_loader_write(loader.get(),
       static_cast<guint8*>(data.data()), data.size(), NULL);
   if (!ok)
     return NULL;
   // Calling gdk_pixbuf_loader_close forces the data to be parsed by the
   // loader.  We must do this before calling gdk_pixbuf_loader_get_pixbuf.
   ok = gdk_pixbuf_loader_close(loader.get(), NULL);
   if (!ok)
     return NULL;
   GdkPixbuf* pixbuf = gdk_pixbuf_loader_get_pixbuf(loader.get());
   if (!pixbuf)
     return NULL;
 
   // The pixbuf is owned by the loader, so add a ref so when we delete the
   // loader (when the ScopedGObject goes out of scope), the pixbuf still
   // exists.
   g_object_ref(pixbuf);
 
   return pixbuf;
 }
-#endif
 
 }  // namespace
 
 ResourceBundle::~ResourceBundle() {
   FreeImages();
   // Free GdkPixbufs.
   for (GdkPixbufMap::iterator i = gdk_pixbufs_.begin();
        i != gdk_pixbufs_.end(); i++) {
     g_object_unref(i->second);
   }
@@ skipping 91 matching lines @@
       return string16();
     }
   }
 
   // Data pack encodes strings as UTF16.
   string16 msg(reinterpret_cast<const char16*>(data.data()),
                data.length() / 2);
   return msg;
 }
 
-#if defined(TOOLKIT_GTK)
 GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) {
   // Check to see if we already have the pixbuf in the cache.
   {
     AutoLock lock_scope(lock_);
     GdkPixbufMap::const_iterator found = gdk_pixbufs_.find(resource_id);
     if (found != gdk_pixbufs_.end())
       return found->second;
   }
 
 
@@ skipping 28 matching lines @@
       // This bitmap will be leaked, but this code should never be hit.
       scoped_ptr<SkBitmap> skia_bitmap(new SkBitmap());
       skia_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
       skia_bitmap->allocPixels();
       skia_bitmap->eraseARGB(255, 255, 0, 0);
       empty_bitmap = gfx::GdkPixbufFromSkBitmap(skia_bitmap.get());
     }
     return empty_bitmap;
   }
 }
-#endif