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

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

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_aurax11.cc
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index a3bd479f1253197a4333387c840b494c0cb38ae9..bdb6fcc3641ff95e518af9245864ca81f1e56353 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -39,34 +39,35 @@ void ResourceBundle::LoadCommonResources() {
// 2x images. The 1x data pack only has 1x images, thus passes in an accurate
// scale factor to gfx::ImageSkia::AddRepresentation.
- AddDataPack(GetResourcesPakFilePath("chrome.pak"),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
+ SCALE_FACTOR_100P);
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
// 1x touch
- AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
- SCALE_FACTOR_100P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+ SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
+ SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x touch
- AddDataPack(GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
- SCALE_FACTOR_200P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
- SCALE_FACTOR_200P);
+ AddDataPackFromPath(
+ GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
+ SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
+ SCALE_FACTOR_200P);
}
} else {
// 1x non touch
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- SCALE_FACTOR_100P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x non touch
- AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
- SCALE_FACTOR_200P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
- SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+ SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+ SCALE_FACTOR_200P);
}
}
}
« no previous file with comments | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698