diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:04:02 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:04:02 +0000 |
| commit | f46251eeb2b498c749a8ec776f2a8e39409a321e (patch) | |
| tree | d3203d530800ac6db6acaac22438ac35fc8d44df /app/resource_bundle_mac.mm | |
| parent | 44ac8912f993424d041460d526ff131286e8c5ca (diff) | |
| download | chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.zip chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.tar.gz chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.tar.bz2 | |
Remove themes/default.dll and merge the resources into chrome.dll.
This gives us one less file to load on startup. This does mean
that some tests need to explicitly include theme_resources.rc.
BUG=24035
Review URL: http://codereview.chromium.org/348033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_mac.mm')
| -rw-r--r-- | app/resource_bundle_mac.mm | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index 7a6139f..547c84b 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -26,7 +26,6 @@ ResourceBundle::~ResourceBundle() { locale_resources_data_ = NULL; delete resources_data_; resources_data_ = NULL; - theme_data_ = NULL; } namespace { @@ -64,13 +63,6 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { DCHECK(locale_resources_data_) << "failed to load locale.pak"; } -void ResourceBundle::LoadThemeResources() { - // 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) { |