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

app/resource_bundle.h

 // 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.
 
 #ifndef APP_RESOURCE_BUNDLE_H_
 #define APP_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 56 matching lines @@
   // NOTE: Mac ignores this and always loads up resources for the language
   // defined by the Cocoa UI (ie-NSBundle does the langange work).
   static void InitSharedInstance(const std::wstring& pref_locale);
 
   // Delete the ResourceBundle for this process if it exists.
   static void CleanupSharedInstance();
 
   // Return the global resource loader instance.
   static ResourceBundle& GetSharedInstance();
 
-  // Load the data file that contains theme resources if present.
-  void LoadThemeResources();
-
-  // Gets the bitmap with the specified resource_id, first by looking into the
-  // theme data, then in the current module data if applicable.
-  // Returns a pointer to a shared instance of the SkBitmap. This shared bitmap
-  // is owned by the resource bundle and should not be freed.
+  // Gets the bitmap with the specified resource_id from the current module
+  // data. Returns a pointer to a shared instance of the SkBitmap. This shared
+  // bitmap is owned by the resource bundle and should not be freed.
   //
   // The bitmap is assumed to exist. This function will log in release, and
   // assert in debug mode if it does not. On failure, this will return a
   // pointer to a shared empty placeholder bitmap so it will be visible what
   // is missing.
   SkBitmap* GetBitmapNamed(int resource_id);
 
   // Loads the raw bytes of an image resource into |bytes|,
   // without doing any processing or interpretation of
   // the resource. Returns whether we successfully read the resource.
@@ skipping 15 matching lines @@
   base::StringPiece GetRawDataResource(int resource_id);
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   string16 GetLocalizedString(int message_id);
 
   // Returns the font for the specified style.
   const gfx::Font& GetFont(FontStyle style);
 
 #if defined(OS_WIN)
-  // Loads and returns an icon from the theme dll.
+  // Loads and returns an icon from the app module.
   HICON LoadThemeIcon(int icon_id);
 
   // Loads and returns a cursor from the app module.
   HCURSOR LoadCursor(int cursor_id);
 #elif defined(OS_MACOSX)
   // Wrapper for GetBitmapNamed. Converts the bitmap to an autoreleased NSImage.
   NSImage* GetNSImageNamed(int resource_id);
 #elif defined(USE_X11)
-  // Gets the GdkPixbuf with the specified resource_id, first by looking into
-  // the theme data, than in the current module data if applicable.  Returns a
-  // pointer to a shared instance of the GdkPixbuf.  This shared GdkPixbuf is
-  // owned by the resource bundle and should not be freed.
+  // Gets the GdkPixbuf with the specified resource_id from the main data pak
+  // file. Returns a pointer to a shared instance of the GdkPixbuf.  This
+  // shared GdkPixbuf is owned by the resource bundle and should not be freed.
   //
   // The bitmap is assumed to exist. This function will log in release, and
   // assert in debug mode if it does not. On failure, this will return a
   // pointer to a shared empty placeholder bitmap so it will be visible what
   // is missing.
   GdkPixbuf* GetPixbufNamed(int resource_id);
 
   // As above, but flips it in RTL locales.
   GdkPixbuf* GetRTLEnabledPixbufNamed(int resource_id);
 
@@ skipping 54 matching lines @@
   // done.
   static SkBitmap* LoadBitmap(DataHandle dll_inst, int resource_id);
 
   // Class level lock.  Used to protect internal data structures that may be
   // accessed from other threads (e.g., skia_images_).
   Lock lock_;
 
   // Handles for data sources.
   DataHandle resources_data_;
   DataHandle locale_resources_data_;
-  DataHandle theme_data_;
 
   // Cached images. The ResourceBundle caches all retrieved bitmaps and keeps
   // ownership of the pointers.
   typedef std::map<int, SkBitmap*> SkImageMap;
   SkImageMap skia_images_;
 #if defined(USE_X11)
   typedef std::map<int, GdkPixbuf*> GdkPixbufMap;
   GdkPixbufMap gdk_pixbufs_;
 #endif
 
   // The various fonts used. Cached to avoid repeated GDI creation/destruction.
   scoped_ptr<gfx::Font> base_font_;
   scoped_ptr<gfx::Font> small_font_;
   scoped_ptr<gfx::Font> medium_font_;
   scoped_ptr<gfx::Font> medium_bold_font_;
   scoped_ptr<gfx::Font> large_font_;
   scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
 #endif  // APP_RESOURCE_BUNDLE_H_