| Index: ui/base/resource/resource_bundle_ios.mm
|
| diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
|
| index d9f1fb5437c9deaae98d692f81721cd067312d30..e054802b32be1b41a28f918b2614918854b4c09d 100644
|
| --- a/ui/base/resource/resource_bundle_ios.mm
|
| +++ b/ui/base/resource/resource_bundle_ios.mm
|
| @@ -12,10 +12,10 @@
|
| #include "base/files/file_path.h"
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/foundation_util.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| -#include "base/synchronization/lock.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "ui/base/resource/resource_handle.h"
|
| #include "ui/gfx/image/image.h"
|
|
|
| @@ -120,14 +120,14 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
|
| }
|
|
|
| // Create a data object from the raw bytes.
|
| - scoped_nsobject<NSData> ns_data(
|
| + base::scoped_nsobject<NSData> ns_data(
|
| [[NSData alloc] initWithBytes:data->front() length:data->size()]);
|
|
|
| bool is_fallback = PNGContainsFallbackMarker(data->front(), data->size());
|
| // Create the image from the data.
|
| CGFloat target_scale = ui::GetScaleFactorScale(scale_factor);
|
| CGFloat source_scale = is_fallback ? 1.0 : target_scale;
|
| - scoped_nsobject<UIImage> ui_image(
|
| + base::scoped_nsobject<UIImage> ui_image(
|
| [[UIImage alloc] initWithData:ns_data scale:source_scale]);
|
|
|
| // If the image is a 1x fallback, scale it up to a full-size representation.
|
|
|