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

Unified Diff: chrome/common/extensions/api/extension_api.cc

Issue 10412004: Revert "Revert 137734 - 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/common/chrome_content_client.cc ('k') | chrome/common/extensions/simple_feature_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/extension_api.cc
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 7a19a3ef93e007b9ffa35867871a52a6161af967..70ff413c4b6cda402b9067badc07874e8f65df69 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -23,6 +23,7 @@
#include "googleurl/src/gurl.h"
#include "grit/common_resources.h"
#include "grit/extensions_api_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using base::DictionaryValue;
@@ -61,7 +62,8 @@ bool HasUnprivilegedChild(const DictionaryValue* name_space_node,
}
base::StringPiece ReadFromResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, ui::SCALE_FACTOR_NONE);
}
scoped_ptr<ListValue> LoadSchemaList(const std::string& name,
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/extensions/simple_feature_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698