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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10270023: Add new ResourceBundle::Delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« ui/base/resource/resource_bundle.cc ('K') | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | ui/base/resource/resource_bundle_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_aurax11.cc
===================================================================
--- ui/base/resource/resource_bundle_aurax11.cc (revision 134688)
+++ ui/base/resource/resource_bundle_aurax11.cc (working copy)
@@ -25,16 +25,20 @@
namespace ui {
void ResourceBundle::LoadCommonResources() {
- AddDataPack(GetResourcesPakFilePath("chrome.pak"),
+ AddDataPack("chrome",
+ GetResourcesPakFilePath("chrome.pak"),
ResourceHandle::kScaleFactor100x);
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ AddDataPack("theme_resources_standard",
+ GetResourcesPakFilePath("theme_resources_standard.pak"),
ResourceHandle::kScaleFactor100x);
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
- AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
+ AddDataPack("ui_resources_touch",
+ GetResourcesPakFilePath("ui_resources_touch.pak"),
ResourceHandle::kScaleFactor100x);
} else {
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ AddDataPack("ui_resources_standard",
+ GetResourcesPakFilePath("ui_resources_standard.pak"),
ResourceHandle::kScaleFactor100x);
}
}
« ui/base/resource/resource_bundle.cc ('K') | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | ui/base/resource/resource_bundle_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698