diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 22:39:22 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 22:39:22 +0000 |
| commit | cd4dd26f4362f3ee4591f21d2c30013136f7f78d (patch) | |
| tree | c590cf3cfd5492f9e5e3cabd59eaa0fa157e3533 /app/resource_bundle_mac.mm | |
| parent | e20189ec30df44c73996bbd6854b2732cc226882 (diff) | |
| download | chromium_src-cd4dd26f4362f3ee4591f21d2c30013136f7f78d.zip chromium_src-cd4dd26f4362f3ee4591f21d2c30013136f7f78d.tar.gz chromium_src-cd4dd26f4362f3ee4591f21d2c30013136f7f78d.tar.bz2 | |
Merge themes/default.pak into chrome.pak for Mac and Linux builds.
In theory this should result in a slightly faster app startup.
I will do a follow up change to merge it on Windows and get rid of
the code related to the extra file.
BUG=24035
Review URL: http://codereview.chromium.org/344038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_mac.mm')
| -rw-r--r-- | app/resource_bundle_mac.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index 0bde757..7a6139f 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -24,10 +24,9 @@ ResourceBundle::~ResourceBundle() { delete locale_resources_data_; locale_resources_data_ = NULL; - delete theme_data_; - theme_data_ = NULL; delete resources_data_; resources_data_ = NULL; + theme_data_ = NULL; } namespace { @@ -66,9 +65,10 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { } void ResourceBundle::LoadThemeResources() { - DCHECK(theme_data_ == NULL) << "theme data already loaded!"; - theme_data_ = LoadResourceDataPack(@"theme"); - DCHECK(theme_data_) << "failed to load theme.pak"; + // 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 |