Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1821)

Unified Diff: app/resource_bundle_linux.cc

Issue 348033: Remove themes/default.dll and merge the resources into chrome.dll. (Closed)
Patch Set: update comments Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/resource_bundle.cc ('k') | app/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle_linux.cc
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 1fe4cb6e4afbb14a9119fdb23d07aed2e3a5881b..99ac0d711be71bed0ee682581e4ef6589dd374ae 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -69,7 +69,6 @@ ResourceBundle::~ResourceBundle() {
locale_resources_data_ = NULL;
delete resources_data_;
resources_data_ = NULL;
- theme_data_ = NULL;
}
void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
@@ -107,13 +106,6 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
return locale_path.AppendASCII(app_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) {
« no previous file with comments | « app/resource_bundle.cc ('k') | app/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698