| Index: chrome/browser/ui/views/elevation_icon_setter.cc
|
| diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc
|
| index 877ff9a32480fbac0e9fc1c34f71d20f31967509..7ad062fa22b25cbc7dcb8b82d693c88f339d27ca 100644
|
| --- a/chrome/browser/ui/views/elevation_icon_setter.cc
|
| +++ b/chrome/browser/ui/views/elevation_icon_setter.cc
|
| @@ -24,8 +24,8 @@
|
|
|
| namespace {
|
|
|
| -scoped_ptr<SkBitmap> GetElevationIcon() {
|
| - scoped_ptr<SkBitmap> icon;
|
| +std::unique_ptr<SkBitmap> GetElevationIcon() {
|
| + std::unique_ptr<SkBitmap> icon;
|
| #if defined(OS_WIN)
|
| if ((base::win::GetVersion() < base::win::VERSION_VISTA) ||
|
| !base::win::UserAccountControlIsEnabled())
|
| @@ -75,7 +75,7 @@ ElevationIconSetter::~ElevationIconSetter() {
|
| }
|
|
|
| void ElevationIconSetter::SetButtonIcon(const base::Closure& callback,
|
| - scoped_ptr<SkBitmap> icon) {
|
| + std::unique_ptr<SkBitmap> icon) {
|
| if (icon) {
|
| float device_scale_factor = 1.0f;
|
| #if defined(OS_WIN)
|
|
|