Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1397)

Unified Diff: chrome/browser/extensions/extension_protocols.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_protocols.cc
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 67e92a7652155cc5d1583b02c983e9da4d56d1f7..ed7416ec4e3d4fdc5b37ac877d4bb0ac176ef921 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();
Aaron Boodman 2012/05/17 20:54:02 It seems kinda silly to have to pass a scale facto
// Requests should not block on the disk! On Windows this goes to the
// registry.
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698