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 /content/test/test_content_client.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 'content/test/test_content_client.cc')
| -rw-r--r-- | content/test/test_content_client.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index 0d2e3e0..11d9bb6 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -11,7 +11,7 @@ #include "base/string_piece.h" TestContentClient::TestContentClient() - : data_pack_(ui::SCALE_FACTOR_100P) { + : data_pack_(ui::ResourceHandle::kScaleFactor100x) { FilePath content_resources_pack_path; PathService::Get(base::DIR_MODULE, &content_resources_pack_path); content_resources_pack_path = content_resources_pack_path.Append( @@ -58,9 +58,15 @@ string16 TestContentClient::GetLocalizedString(int message_id) const { return string16(); } -base::StringPiece TestContentClient::GetDataResource( +base::StringPiece TestContentClient::GetDataResource(int resource_id) const { + base::StringPiece resource; + data_pack_.GetStringPiece(resource_id, &resource); + return resource; +} + +base::StringPiece TestContentClient::GetImageResource( int resource_id, - ui::ScaleFactor scale_factor) const { + float scale_factor) const { base::StringPiece resource; data_pack_.GetStringPiece(resource_id, &resource); return resource; |