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

app/resource_bundle_win.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 "app/resource_bundle.h"
 
 #include <atlbase.h>
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
@@ skipping 18 matching lines @@
 
 }  // end anonymous namespace
 
 ResourceBundle::~ResourceBundle() {
   FreeImages();
 
   if (locale_resources_data_) {
     BOOL rv = FreeLibrary(locale_resources_data_);
     DCHECK(rv);
   }
-  if (theme_data_) {
-    BOOL rv = FreeLibrary(theme_data_);
-    DCHECK(rv);
-  }
 }
 
 void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
   // As a convenience, set resources_data_ to the current module.
   resources_data_ = _AtlBaseModule.GetModuleInstance();
 
   DCHECK(NULL == locale_resources_data_) << "locale dll already loaded";
   const FilePath& locale_path = GetLocaleFilePath(pref_locale);
   if (locale_path.value().empty()) {
     // It's possible that there are no locale dlls found, in which case we just
@@ skipping 13 matching lines @@
   FilePath locale_path;
   PathService::Get(app::DIR_LOCALES, &locale_path);
 
   const std::string app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
     return FilePath();
 
   return locale_path.AppendASCII(app_locale + ".dll");
 }
 
-void ResourceBundle::LoadThemeResources() {
-  DCHECK(NULL == theme_data_) << "theme dll already loaded";
-  FilePath theme_data_path;
-  PathService::Get(app::DIR_THEMES, &theme_data_path);
-  theme_data_path = theme_data_path.AppendASCII("default.dll");
-
-  // The dll should only have resources, not executable code.
-  theme_data_ = LoadLibraryEx(theme_data_path.value().c_str(), NULL,
-                              GetDataDllLoadFlags());
-  DCHECK(theme_data_ != NULL) << "unable to load " << theme_data_path.value();
-}
-
 // static
 RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
     DataHandle module, int resource_id) {
   void* data_ptr;
   size_t data_size;
   if (base::GetDataResourceFromModule(module, resource_id, &data_ptr,
                                       &data_size)) {
     return new RefCountedStaticMemory(
         reinterpret_cast<const unsigned char*>(data_ptr), data_size);
   } else {
     return NULL;
   }
 }
 
 HICON ResourceBundle::LoadThemeIcon(int icon_id) {
-  return ::LoadIcon(theme_data_, MAKEINTRESOURCE(icon_id));
+  return ::LoadIcon(resources_data_, MAKEINTRESOURCE(icon_id));
 }
 
 base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
   void* data_ptr;
   size_t data_size;
   if (base::GetDataResourceFromModule(_AtlBaseModule.GetModuleInstance(),
                                       resource_id,
                                       &data_ptr,
                                       &data_size)) {
     return base::StringPiece(static_cast<const char*>(data_ptr), data_size);
@@ skipping 35 matching lines @@
                                       message_id);
     if (!image) {
       StackTrace().PrintBacktrace();  // See http://crbug.com/21925.
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
   // Copy into a string16 and return.
   return string16(image->achString, image->nLength);
 }