Merge themes/default.pak into chrome.pak for Mac and Linux builds.

app/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 "app/resource_bundle.h"
 
 #include <gtk/gtk.h>
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
@@ skipping 49 matching lines @@
   FreeImages();
   // Free GdkPixbufs.
   for (GdkPixbufMap::iterator i = gdk_pixbufs_.begin();
        i != gdk_pixbufs_.end(); i++) {
     g_object_unref(i->second);
   }
   gdk_pixbufs_.clear();
 
   delete locale_resources_data_;
   locale_resources_data_ = NULL;
-  delete theme_data_;
-  theme_data_ = NULL;
   delete resources_data_;
   resources_data_ = NULL;
+  theme_data_ = NULL;
 }
 
 void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
   FilePath resources_data_path;
   PathService::Get(base::DIR_EXE, &resources_data_path);
   resources_data_path = resources_data_path.Append(
       FILE_PATH_LITERAL("chrome.pak"));
   DCHECK(resources_data_ == NULL) << "resource data already loaded!";
   resources_data_ = new base::DataPack;
   bool success = resources_data_->Load(resources_data_path);
@@ skipping 18 matching lines @@
   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 + ".pak");
 }
 
 void ResourceBundle::LoadThemeResources() {
-  FilePath theme_data_path;
-  PathService::Get(app::DIR_THEMES, &theme_data_path);
-  theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
-  theme_data_ = new base::DataPack;
-  bool success = theme_data_->Load(theme_data_path);
-  DCHECK(success) << "failed to load theme data";
+  // The data has been merged with chrome.pak so just set the pointer to be
+  // the same file.
+  DCHECK(resources_data_);
+  theme_data_ = resources_data_;
 }
 
 // static
 RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
     DataHandle module, int resource_id) {
   DCHECK(module);
   return module->GetStaticMemory(resource_id);
 }
 
 base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
@@ skipping 83 matching lines @@
   }
 }
 
 GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) {
   return GetPixbufImpl(resource_id, false);
 }
 
 GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) {
   return GetPixbufImpl(resource_id, true);
 }