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

Unified Diff: content/shell/shell_content_client.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. 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: content/shell/shell_content_client.cc
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index 64ee8eadf960c3a2cdb622a8dd2e23255ca9f2a7..b653fcbf266b9e6b8a81ed4fa97365cf41713beb 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -6,6 +6,7 @@
#include "base/string_piece.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
#include "webkit/glue/user_agent.h"
namespace content {
@@ -53,7 +54,8 @@ string16 ShellContentClient::GetLocalizedString(int message_id) const {
}
base::StringPiece ShellContentClient::GetDataResource(int resource_id) const {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, ui::ResourceHandle::kScaleFactorNone);
}
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698