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

Unified Diff: chrome/browser/ui/webui/shared_resources_data_source.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: chrome/browser/ui/webui/shared_resources_data_source.cc
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index 1cb35857f26115632c0a0a1bde84797521b39e7d..4f1b7e099ed595ac855320416cc2329f81a40c3d 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc
@@ -20,6 +20,7 @@
#include "grit/ui_resources.h"
#include "net/base/mime_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
#include "ui/base/ui_base_switches.h"
namespace {
@@ -75,7 +76,7 @@ void SharedResourcesDataSource::StartDataRequest(const std::string& path,
DCHECK_NE(-1, idr) << " path: " << path;
const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
scoped_refptr<base::RefCountedStaticMemory> bytes(
- rb.LoadDataResourceBytes(idr));
+ rb.LoadDataResourceBytes(idr, ui::ResourceHandle::kScaleFactorNone));
SendResponse(request_id, bytes);
}

Powered by Google App Engine
This is Rietveld 408576698