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

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

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build 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
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 13aaacf68daa1bdef390d6c9773c616e52e5d8da..9d54da80a39b635433f672704a52f44f45e4d7e4 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -89,9 +89,10 @@ bool ResourceBundle::LocaleDataPakExists(const std::string& locale) {
return !GetLocaleFilePath(locale).empty();
}
-void ResourceBundle::AddDataPack(const FilePath& path) {
+void ResourceBundle::AddDataPack(const FilePath& path, float scale_factor) {
scoped_ptr<DataPack> data_pack(new DataPack());
if (data_pack->Load(path)) {
+ data_pack->set_scale_factor(scale_factor);
data_packs_.push_back(data_pack.release());
} else {
LOG(ERROR) << "Failed to load " << path.value()

Powered by Google App Engine
This is Rietveld 408576698