diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:05:40 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:05:40 +0000 |
| commit | bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f (patch) | |
| tree | 2858dc6858da0f4c70b7d4fa2d11ba02ca83fde6 /webkit/tools/test_shell/test_shell_win.cc | |
| parent | c145c83565c8c019f97d0280d12c623352e1c58e (diff) | |
| download | chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.zip chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.gz chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_win.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index e56530b..70e1e05 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -21,8 +21,8 @@ #include "base/utf_string_conversions.h" #include "base/win/resource_util.h" #include "breakpad/src/client/windows/handler/exception_handler.h" -#include "grit/webkit_resources.h" #include "grit/webkit_chromium_resources.h" +#include "grit/webkit_resources.h" #include "net/base/net_module.h" #include "net/url_request/url_request_file_job.h" #include "skia/ext/bitmap_platform_device.h" @@ -669,13 +669,10 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) { return string16(localized, length); } -base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) { - return base::StringPiece(); -} - // TODO(tc): Convert this to using resources from test_shell.rc. -base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id, - float scale_factor) { +base::StringPiece TestShellWebKitInit::GetDataResource( + int resource_id, + ui::ScaleFactor scale_factor) { switch (resource_id) { case IDR_BROKENIMAGE: { // Use webkit's broken image icon (16x16) |