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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/plugin_finder.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/browser/notifications/desktop_notification_service.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugin_finder.cc
diff --git a/chrome/browser/plugin_finder.cc b/chrome/browser/plugin_finder.cc
index 245616922e6f77cc41e01cf623d5757f60dff7fc..6b3da59fa63750cf500fcd7f478b8b5a1fc23d62 100644
--- a/chrome/browser/plugin_finder.cc
+++ b/chrome/browser/plugin_finder.cc
@@ -16,6 +16,7 @@
#include "content/public/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
#include "grit/browser_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using base::DictionaryValue;
@@ -44,7 +45,7 @@ DictionaryValue* PluginFinder::LoadPluginList() {
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
base::StringPiece json_resource(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_PLUGIN_DB_JSON));
+ IDR_PLUGIN_DB_JSON, ui::SCALE_FACTOR_NONE));
std::string error_str;
scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
json_resource.as_string(),
« chrome/browser/extensions/extension_protocols.cc ('K') | « chrome/browser/notifications/desktop_notification_service.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698