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 /chrome/browser/extensions/extension_protocols.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 'chrome/browser/extensions/extension_protocols.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_protocols.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index 67e92a7..ed7416e 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -27,11 +27,12 @@ #include "grit/component_extension_resources_map.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "net/http/http_response_info.h" #include "net/http/http_response_headers.h" +#include "net/http/http_response_info.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_simple_job.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::ResourceRequestInfo; @@ -73,7 +74,8 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { std::string* charset, std::string* data) const OVERRIDE { const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - *data = rb.GetRawDataResource(resource_id_).as_string(); + *data = rb.GetRawDataResource( + resource_id_, ui::SCALE_FACTOR_NONE).as_string(); // Requests should not block on the disk! On Windows this goes to the // registry. |