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 /ui/base/resource/resource_data_dll_win.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 'ui/base/resource/resource_data_dll_win.cc')
| -rw-r--r-- | ui/base/resource/resource_data_dll_win.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ui/base/resource/resource_data_dll_win.cc b/ui/base/resource/resource_data_dll_win.cc index c6c90c71..48e9db1 100644 --- a/ui/base/resource/resource_data_dll_win.cc +++ b/ui/base/resource/resource_data_dll_win.cc @@ -17,15 +17,6 @@ ResourceDataDLL::ResourceDataDLL(HINSTANCE module) : module_(module) { ResourceDataDLL::~ResourceDataDLL() { } -bool ResourceDataDLL::HasResource(uint16 resource_id) const { - void* data_ptr; - size_t data_size; - return base::win::GetDataResourceFromModule(module_, - resource_id, - &data_ptr, - &data_size); -} - bool ResourceDataDLL::GetStringPiece(uint16 resource_id, base::StringPiece* data) const { DCHECK(data); @@ -57,8 +48,8 @@ ResourceHandle::TextEncodingType ResourceDataDLL::GetTextEncodingType() const { return BINARY; } -ScaleFactor ResourceDataDLL::GetScaleFactor() const { - return ui::SCALE_FACTOR_NONE; +float ResourceDataDLL::GetScaleFactor() const { + return 1.0; } } // namespace ui |