diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
| commit | 89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (patch) | |
| tree | 6fe013975a64dc1570d455e94d9ffc8153c9dda5 /ui/base/resource/resource_bundle_gtk.cc | |
| parent | c10baf7109f37d519f2500d4c4ba8206b7deee07 (diff) | |
| download | chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.zip chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.gz chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.bz2 | |
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h
I'll cleanup ContentClient in separate CL.
BUG=156569
TEST=none. no functional change.
Review URL: https://chromiumcodereview.appspot.com/11341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc index 1d5d1e3..7040f9e 100644 --- a/ui/base/resource/resource_bundle_gtk.cc +++ b/ui/base/resource/resource_bundle_gtk.cc @@ -89,7 +89,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { if (image.IsEmpty()) { scoped_refptr<base::RefCountedStaticMemory> data( - LoadDataResourceBytes(resource_id, SCALE_FACTOR_100P)); + LoadDataResourceBytesForScale(resource_id, SCALE_FACTOR_100P)); GdkPixbuf* pixbuf = LoadPixbuf(data.get(), rtl == RTL_ENABLED); if (!pixbuf) { |