| Index: chrome/browser/ui/views/bar_control_button.h
|
| diff --git a/chrome/browser/ui/views/bar_control_button.h b/chrome/browser/ui/views/bar_control_button.h
|
| index 00f9b94039f3019b488013f91103c6401288b1a3..20659d1f6fd1b084d8444831308ce35fcae7bb68 100644
|
| --- a/chrome/browser/ui/views/bar_control_button.h
|
| +++ b/chrome/browser/ui/views/bar_control_button.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
|
| #define CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/views/controls/button/image_button.h"
|
|
|
| namespace gfx {
|
| @@ -39,7 +40,7 @@ class BarControlButton : public views::ImageButton {
|
| base::Callback<SkColor(void)> get_text_color_callback_;
|
|
|
| // Controls the visual feedback for the button state.
|
| - scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
|
| + std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BarControlButton);
|
| };
|
|
|