| Index: ui/views/corewm/tooltip_controller.h
|
| diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h
|
| index 5171726c5dc21cb37a6ecf420ee90e3042f6beff..5a274e319cd5edea134ef540a759884c323edbe0 100644
|
| --- a/ui/views/corewm/tooltip_controller.h
|
| +++ b/ui/views/corewm/tooltip_controller.h
|
| @@ -6,9 +6,9 @@
|
| #define UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/aura/window_observer.h"
|
| @@ -35,7 +35,7 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
|
| public ui::EventHandler,
|
| public aura::WindowObserver {
|
| public:
|
| - explicit TooltipController(scoped_ptr<Tooltip> tooltip);
|
| + explicit TooltipController(std::unique_ptr<Tooltip> tooltip);
|
| ~TooltipController() override;
|
|
|
| // Overridden from aura::client::TooltipClient.
|
| @@ -88,7 +88,7 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
|
| aura::Window* tooltip_window_at_mouse_press_;
|
| base::string16 tooltip_text_at_mouse_press_;
|
|
|
| - scoped_ptr<Tooltip> tooltip_;
|
| + std::unique_ptr<Tooltip> tooltip_;
|
|
|
| base::RepeatingTimer tooltip_timer_;
|
|
|
|
|