diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 06:11:52 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 06:11:52 +0000 |
| commit | 63942f254fe21a93e8a0183e2107ea428f7cd7a1 (patch) | |
| tree | 7a0299e8b66b6c088337e5cd483bd7701bba3e01 /ui/base/resource/resource_bundle_gtk.cc | |
| parent | c7d2eb3f7ea80d42722e64fe319d090a199d0a04 (diff) | |
| download | chromium_src-63942f254fe21a93e8a0183e2107ea428f7cd7a1.zip chromium_src-63942f254fe21a93e8a0183e2107ea428f7cd7a1.tar.gz chromium_src-63942f254fe21a93e8a0183e2107ea428f7cd7a1.tar.bz2 | |
Add scale factor tag to data packs
This CL sets the image scale factor for data packs.
This will be used by the DOM UI code to look up encoded PNG data for images with a specific scale factor.
BUG=114311
TEST=
Review URL: http://codereview.chromium.org/10151025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/resource/resource_bundle_gtk.cc')
| -rw-r--r-- | ui/base/resource/resource_bundle_gtk.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc index bc4a5cc..6125dd7 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) { |