diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:28:20 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:28:20 +0000 |
| commit | 61a796c49a99e1e43e462ffd20a489f2142efcc8 (patch) | |
| tree | 255809046b1d17f645b2fad9d3ecebf06c628915 /chrome_frame/simple_resource_loader.cc | |
| parent | 3a62d03239d6e7aacdb94650aae6d962badc0c24 (diff) | |
| download | chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.zip chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.tar.gz chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.tar.bz2 | |
Revert 137734 - Select theme resources from ResourceBundle at requested scale factor.
Return the best match for a requested scale factor when fetching raw image data from ResourceBundle.
TBR=aa,abodenha
BUG=123611
TEST=ResourceBundle.LoadImageResourceBytes
Review URL: https://chromiumcodereview.appspot.com/10387010
TBR=flackr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/simple_resource_loader.cc')
| -rw-r--r-- | chrome_frame/simple_resource_loader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 72ab076..8d1524f 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -206,7 +206,7 @@ bool SimpleResourceLoader::LoadLocalePack( if (file_util::PathExists(resource_pack_path) && file_util::PathExists(dll_path)) { scoped_ptr<ui::DataPack> cur_data_pack( - new ui::DataPack(ui::SCALE_FACTOR_100P)); + new ui::DataPack(ui::ResourceHandle::kScaleFactor100x)); if (!cur_data_pack->Load(resource_pack_path)) continue; |