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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/simple_feature_provider.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
« chrome/browser/extensions/extension_protocols.cc ('K') | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/common/jstemplate_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/simple_feature_provider.cc
diff --git a/chrome/common/extensions/simple_feature_provider.cc b/chrome/common/extensions/simple_feature_provider.cc
index 08bed3131f5592d8f6779edbc0a3c40599b6810e..d17c3601efc7f2e4b6f116246f4ce3316300e712 100644
--- a/chrome/common/extensions/simple_feature_provider.cc
+++ b/chrome/common/extensions/simple_feature_provider.cc
@@ -9,6 +9,7 @@
#include "chrome/common/extensions/manifest_feature.h"
#include "chrome/common/extensions/permission_feature.h"
#include "grit/common_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
namespace extensions {
@@ -42,7 +43,7 @@ struct Static {
int resource_id) {
std::string manifest_features =
ResourceBundle::GetSharedInstance().GetRawDataResource(
- resource_id).as_string();
+ resource_id, ui::SCALE_FACTOR_NONE).as_string();
int error_code = 0;
std::string error_message;
Value* value = base::JSONReader::ReadAndReturnError(
« chrome/browser/extensions/extension_protocols.cc ('K') | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/common/jstemplate_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698