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 /content/browser/debugger | |
| 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 'content/browser/debugger')
| -rw-r--r-- | content/browser/debugger/devtools_http_handler_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc index bbe45a4..e00d4ab 100644 --- a/content/browser/debugger/devtools_http_handler_impl.cc +++ b/content/browser/debugger/devtools_http_handler_impl.cc @@ -38,6 +38,7 @@ #include "net/server/http_server_request_info.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "ui/base/layout.h" namespace content { @@ -230,7 +231,8 @@ void DevToolsHttpHandlerImpl::OnHttpRequest( int resource_id = DevToolsHttpHandler::GetFrontendResourceId(filename); if (resource_id != -1) { base::StringPiece data = - content::GetContentClient()->GetDataResource(resource_id); + content::GetContentClient()->GetDataResource( + resource_id, ui::SCALE_FACTOR_NONE); server_->Send200(connection_id, data.as_string(), GetMimeType(filename)); |