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

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

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_gtk.cc
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index bc4a5cc8bd9fdda181846179609068edba4ab1c8..6125dd7955bfc1775939b4e5570310a20f68462b 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted_memory.h"
#include "base/path_service.h"
+#include "ui/base/resource/resource_handle.h"
#include "base/synchronization/lock.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/gtk/scoped_gobject.h"
@@ -61,9 +62,12 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
} // namespace
void ResourceBundle::LoadCommonResources() {
- AddDataPack(GetResourcesPakFilePath("chrome.pak"));
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+ AddDataPack(GetResourcesPakFilePath("chrome.pak"),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
}
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698