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.h | |
| 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.h')
| -rw-r--r-- | content/test/test_content_client.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h index ecf449b..94fb820 100644 --- a/content/test/test_content_client.h +++ b/content/test/test_content_client.h @@ -32,9 +32,9 @@ class TestContentClient : public content::ContentClient { virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE; virtual std::string GetUserAgent() const OVERRIDE; virtual string16 GetLocalizedString(int message_id) const OVERRIDE; - virtual base::StringPiece GetDataResource( - int resource_id, - ui::ScaleFactor scale_factor) const OVERRIDE; + virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE; + virtual base::StringPiece GetImageResource(int resource_id, + float scale_factor) const OVERRIDE; #if defined(OS_WIN) virtual bool SandboxPlugin(CommandLine* command_line, sandbox::TargetPolicy* policy) OVERRIDE; |