From c49201a506dba0e3a04aad623e4b259f948f3159 Mon Sep 17 00:00:00 2001 From: "flackr@chromium.org" Date: Thu, 24 May 2012 11:04:57 +0000 Subject: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor." Relanding original CL 137734, http://codereview.chromium.org/10387010/. TBR=aa,abodenha,ben,sail,tony BUG=123611 TEST=All try bots pass and aura runs without errors. Review URL: https://chromiumcodereview.appspot.com/10412004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/debugger/devtools_http_handler_impl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'content/browser/debugger/devtools_http_handler_impl.cc') diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc index c7c13ec..a32fcd8 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 { @@ -228,7 +229,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)); -- cgit v1.1