| 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);
|
|
|
|
|