| Index: ui/message_center/popup_timers_controller.h
|
| diff --git a/ui/message_center/popup_timers_controller.h b/ui/message_center/popup_timers_controller.h
|
| index d2e2db729cb3466cde4411d25d41b0a8ee514145..95e84426df557609383384c03d704a8b498f8b82 100644
|
| --- a/ui/message_center/popup_timers_controller.h
|
| +++ b/ui/message_center/popup_timers_controller.h
|
| @@ -6,10 +6,10 @@
|
| #define UI_MESSAGE_CENTER_POPUP_TIMERS_CONTROLLER_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/message_center/message_center_observer.h"
|
| @@ -69,7 +69,8 @@ class MESSAGE_CENTER_EXPORT PopupTimersController
|
| MessageCenter* message_center_;
|
|
|
| // The PopupTimerCollection contains all the managed timers by their ID.
|
| - using PopupTimerCollection = std::map<std::string, scoped_ptr<PopupTimer>>;
|
| + using PopupTimerCollection =
|
| + std::map<std::string, std::unique_ptr<PopupTimer>>;
|
| PopupTimerCollection popup_timers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PopupTimersController);
|
|
|