Index: ui/message_center/views/message_popup_collection.h |
diff --git a/ui/message_center/views/message_popup_collection.h b/ui/message_center/views/message_popup_collection.h |
index 138035c59d352ab95c83272f946b7041ac0c5902..b255231bbc71d2e674bb91c798cb6cf8ca70b9eb 100644 |
--- a/ui/message_center/views/message_popup_collection.h |
+++ b/ui/message_center/views/message_popup_collection.h |
@@ -67,7 +67,7 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection |
void ClickOnNotification(const std::string& notification_id) override; |
void RemoveNotification(const std::string& notification_id, |
bool by_user) override; |
- scoped_ptr<ui::MenuModel> CreateMenuModel( |
+ std::unique_ptr<ui::MenuModel> CreateMenuModel( |
const NotifierId& notifier_id, |
const base::string16& display_source) override; |
bool HasClickedListener(const std::string& notification_id) override; |
@@ -168,16 +168,16 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection |
// happens to be right under the mouse, and the user can just dispose of |
// multipel toasts by clicking. The mode ends when defer_timer_ expires. |
bool user_is_closing_toasts_by_clicking_; |
- scoped_ptr<base::OneShotTimer> defer_timer_; |
+ std::unique_ptr<base::OneShotTimer> defer_timer_; |
// The top edge to align the position of the next toast during 'close by |
// clicking" mode. |
// Only to be used when user_is_closing_toasts_by_clicking_ is true. |
int target_top_edge_; |
// Weak, only exists temporarily in tests. |
- scoped_ptr<base::RunLoop> run_loop_for_test_; |
+ std::unique_ptr<base::RunLoop> run_loop_for_test_; |
- scoped_ptr<MessageViewContextMenuController> context_menu_controller_; |
+ std::unique_ptr<MessageViewContextMenuController> context_menu_controller_; |
// Gives out weak pointers to toast contents views which have an unrelated |
// lifetime. Must remain the last member variable. |