Index: ash/system/tray/tray_bar_button_with_title.cc |
diff --git a/ash/system/tray/tray_bar_button_with_title.cc b/ash/system/tray/tray_bar_button_with_title.cc |
index cd7a7613052d51c2c0681226bf99b4c56c500fe2..e67606e2a00cec53e554c6f2e5364f10e5435d47 100644 |
--- a/ash/system/tray/tray_bar_button_with_title.cc |
+++ b/ash/system/tray/tray_bar_button_with_title.cc |
@@ -4,8 +4,9 @@ |
#include "ash/system/tray/tray_bar_button_with_title.h" |
+#include <memory> |
+ |
#include "ash/system/tray/tray_constants.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/image/image_skia.h" |
#include "ui/resources/grit/ui_resources.h" |
@@ -54,7 +55,7 @@ class TrayBarButtonWithTitle::TrayBarButton : public views::View { |
private: |
const int* bar_active_images_; |
const int* bar_disabled_images_; |
- scoped_ptr<views::HorizontalPainter> painter_; |
+ std::unique_ptr<views::HorizontalPainter> painter_; |
DISALLOW_COPY_AND_ASSIGN(TrayBarButton); |
}; |