diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:05:56 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:05:56 +0000 |
| commit | 2c841f7bb90c00ee360e110983af7f330f5c6958 (patch) | |
| tree | a06a9df37e314f77ff2c7d17754d6f3cf1f0a56c /content/shell/shell_content_client.cc | |
| parent | 344f421534d9fb73559c30dea6ce508ed24d28e3 (diff) | |
| download | chromium_src-2c841f7bb90c00ee360e110983af7f330f5c6958.zip chromium_src-2c841f7bb90c00ee360e110983af7f330f5c6958.tar.gz chromium_src-2c841f7bb90c00ee360e110983af7f330f5c6958.tar.bz2 | |
Add scale factor and 2x resources from webkit and plumb through to ContentClient.
BUG=124158
TEST=Run debug chrome with --default-device-scale-factor=2 and view a textarea with scrollbars. The previously blank assets are now there and chrome no longer crashes.
Review URL: https://chromiumcodereview.appspot.com/10383006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_content_client.cc')
| -rw-r--r-- | content/shell/shell_content_client.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc index 64ee8ea..e3c80d8 100644 --- a/content/shell/shell_content_client.cc +++ b/content/shell/shell_content_client.cc @@ -56,6 +56,14 @@ base::StringPiece ShellContentClient::GetDataResource(int resource_id) const { return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); } +base::StringPiece ShellContentClient::GetImageResource( + int resource_id, + float scale_factor) const { + // TODO(flackr): Pass scale_factor to ResourceBundle to get best matching + // image resource for the given scale factor. + return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); +} + #if defined(OS_WIN) bool ShellContentClient::SandboxPlugin(CommandLine* command_line, sandbox::TargetPolicy* policy) { |