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

Unified Diff: ui/base/resource/resource_bundle_posix.cc

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 months 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 | « ui/base/resource/resource_bundle_mac.mm ('k') | ui/gfx/image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_posix.cc
diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc
index 97747e072b1d21b14e10612547fe5d684310a614..d2fe55b66120168ddf510cb003f89a02b4b0d011 100644
--- a/ui/base/resource/resource_bundle_posix.cc
+++ b/ui/base/resource/resource_bundle_posix.cc
@@ -98,6 +98,14 @@ void ResourceBundle::LoadCommonResources() {
CHECK(!resources_file_path.empty()) << "chrome.pak not found";
resources_data_ = LoadResourcesDataPak(resources_file_path);
CHECK(resources_data_) << "failed to load chrome.pak";
+
+ FilePath large_icon_resources_file_path = GetLargeIconResourcesFilePath();
+ if (!large_icon_resources_file_path.empty()) {
+ large_icon_resources_data_ =
+ LoadResourcesDataPak(large_icon_resources_file_path);
+ CHECK(large_icon_resources_data_) <<
+ "failed to load theme_resources_large.pak";
+ }
}
std::string ResourceBundle::LoadLocaleResources(
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | ui/gfx/image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698