| Index: ui/base/resource/resource_bundle_mac.mm
|
| diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
|
| index 28e1ee87d89ec6cb7228029d51f1af0db8d693d0..79f834f9537ac363c7d5900b5ef8f9c6cce20fb9 100644
|
| --- a/ui/base/resource/resource_bundle_mac.mm
|
| +++ b/ui/base/resource/resource_bundle_mac.mm
|
| @@ -11,8 +11,8 @@
|
| #include "base/files/file_path.h"
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/mac_util.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/synchronization/lock.h"
|
| #include "ui/base/resource/resource_handle.h"
|
| @@ -119,16 +119,15 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
|
| image = delegate_->GetNativeImageNamed(resource_id, rtl);
|
|
|
| if (image.IsEmpty()) {
|
| - scoped_nsobject<NSImage> ns_image;
|
| + base::scoped_nsobject<NSImage> ns_image;
|
| for (size_t i = 0; i < data_packs_.size(); ++i) {
|
| scoped_refptr<base::RefCountedStaticMemory> data(
|
| data_packs_[i]->GetStaticMemory(resource_id));
|
| if (!data.get())
|
| continue;
|
|
|
| - scoped_nsobject<NSData> ns_data(
|
| - [[NSData alloc] initWithBytes:data->front()
|
| - length:data->size()]);
|
| + base::scoped_nsobject<NSData> ns_data(
|
| + [[NSData alloc] initWithBytes:data->front() length:data->size()]);
|
| if (!ns_image.get()) {
|
| ns_image.reset([[NSImage alloc] initWithData:ns_data]);
|
| } else {
|
|
|