Remove themes/default.dll and merge the resources into chrome.dll.

app/resource_bundle.cc

 // Copyright (c) 2006-2009 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 "app/resource_bundle.h"
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
@@ skipping 37 matching lines @@
 
 /* static */
 ResourceBundle& ResourceBundle::GetSharedInstance() {
   // Must call InitSharedInstance before this function.
   CHECK(g_shared_instance_ != NULL);
   return *g_shared_instance_;
 }
 
 ResourceBundle::ResourceBundle()
     : resources_data_(NULL),
-      locale_resources_data_(NULL),
-      theme_data_(NULL) {
+      locale_resources_data_(NULL) {
 }
 
 void ResourceBundle::FreeImages() {
   for (SkImageMap::iterator i = skia_images_.begin();
        i != skia_images_.end(); i++) {
     delete i->second;
   }
   skia_images_.clear();
 }
 
@@ skipping 12 matching lines @@
 
   return new SkBitmap(bitmap);
 }
 
 std::string ResourceBundle::GetDataResource(int resource_id) {
   return GetRawDataResource(resource_id).as_string();
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadImageResourceBytes(
     int resource_id) {
-  return LoadResourceBytes(theme_data_, resource_id);
+  return LoadResourceBytes(resources_data_, resource_id);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
     int resource_id) {
   return LoadResourceBytes(resources_data_, resource_id);
 }
 
 SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
   // Check to see if we already have the Skia image in the cache.
   {
     AutoLock lock_scope(lock_);
     SkImageMap::const_iterator found = skia_images_.find(resource_id);
     if (found != skia_images_.end())
       return found->second;
   }
 
   scoped_ptr<SkBitmap> bitmap;
 
-  if (theme_data_)
-    bitmap.reset(LoadBitmap(theme_data_, resource_id));
+  bitmap.reset(LoadBitmap(resources_data_, resource_id));
 
-  // If we did not find the bitmap in the theme DLL, try the current one.
-  if (!bitmap.get())
-    bitmap.reset(LoadBitmap(resources_data_, resource_id));
-
-  // We loaded successfully.  Cache the Skia version of the bitmap.
   if (bitmap.get()) {
+    // We loaded successfully.  Cache the Skia version of the bitmap.
     AutoLock lock_scope(lock_);
 
     // Another thread raced us, and has already cached the skia image.
     if (skia_images_.count(resource_id))
       return skia_images_[resource_id];
 
     skia_images_[resource_id] = bitmap.get();
     return bitmap.release();
   }
 
@@ skipping 54 matching lines @@
     case MediumFont:
       return *medium_font_;
     case MediumBoldFont:
       return *medium_bold_font_;
     case LargeFont:
       return *large_font_;
     default:
       return *base_font_;
   }
 }