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

Unified Diff: chrome/browser/extensions/component_loader.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
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index b077315e48a674b5a0549a4b92b0db2ebbe5e36a..36ee3e0dec2d85913c782807cfdfd1d2fa26ddab 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -24,6 +24,7 @@
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "grit/browser_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#if defined(OFFICIAL_BUILD)
@@ -89,7 +90,8 @@ const Extension* ComponentLoader::Add(
const FilePath& root_directory) {
std::string manifest_contents =
ResourceBundle::GetSharedInstance().GetRawDataResource(
- manifest_resource_id).as_string();
+ manifest_resource_id,
+ ui::SCALE_FACTOR_NONE).as_string();
return Add(manifest_contents, root_directory);
}
@@ -249,7 +251,8 @@ void ComponentLoader::AddOrReloadEnterpriseWebStore() {
if (!enterprise_webstore_url.empty()) {
std::string manifest_contents =
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_ENTERPRISE_WEBSTORE_MANIFEST).as_string();
+ IDR_ENTERPRISE_WEBSTORE_MANIFEST,
+ ui::SCALE_FACTOR_NONE).as_string();
// The manifest is missing some values that are provided by policy.
DictionaryValue* manifest = ParseManifest(manifest_contents);

Powered by Google App Engine
This is Rietveld 408576698