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

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update to address newly added use Created 4 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 | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_bundle_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 0f95c9e2e08dfdbeaa388cf67755dbdbc57ca9a6..daab4db206f9ab86e0bfbdac730c606b2af9121a 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -440,15 +440,15 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {
return images_[resource_id];
}
-base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
+base::RefCountedMemory* ResourceBundle::LoadDataResourceBytes(
int resource_id) const {
return LoadDataResourceBytesForScale(resource_id, ui::SCALE_FACTOR_NONE);
}
-base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytesForScale(
+base::RefCountedMemory* ResourceBundle::LoadDataResourceBytesForScale(
int resource_id,
ScaleFactor scale_factor) const {
- base::RefCountedStaticMemory* bytes = NULL;
+ base::RefCountedMemory* bytes = NULL;
if (delegate_)
bytes = delegate_->LoadDataResourceBytes(resource_id, scale_factor);
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_bundle_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698