| Index: ui/views/corewm/tooltip_controller.cc
|
| diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc
|
| index c5dad8c4598c25a909510b13485498aca114a4c3..a71001719fc2fe7b4deba9cc1da79b8e5dc8f279 100644
|
| --- a/ui/views/corewm/tooltip_controller.cc
|
| +++ b/ui/views/corewm/tooltip_controller.cc
|
| @@ -124,7 +124,7 @@ aura::Window* GetTooltipTarget(const ui::MouseEvent& event,
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // TooltipController public:
|
|
|
| -TooltipController::TooltipController(scoped_ptr<Tooltip> tooltip)
|
| +TooltipController::TooltipController(std::unique_ptr<Tooltip> tooltip)
|
| : tooltip_window_(NULL),
|
| tooltip_id_(NULL),
|
| tooltip_window_at_mouse_press_(NULL),
|
|
|