Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Unified Diff: ui/message_center/views/notifier_settings_view.h

Issue 2574583005: Remove stl_util's deletion function use from message center notifier settings. (Closed)
Patch Set: nits Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/message_center/notifier_settings.h ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/notifier_settings_view.h
diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h
index 6c4545ec0c8c61c56464c2319a920af1c557de6b..1e23d5a08682798592970a31efe2c5cf014292e4 100644
--- a/ui/message_center/views/notifier_settings_view.h
+++ b/ui/message_center/views/notifier_settings_view.h
@@ -61,7 +61,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
public views::ButtonListener {
public:
NotifierButton(NotifierSettingsProvider* provider,
- Notifier* notifier,
+ std::unique_ptr<Notifier> notifier,
views::ButtonListener* listener);
~NotifierButton() override;
@@ -84,7 +84,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
void GridChanged(bool has_learn_more, bool has_icon_view);
NotifierSettingsProvider* provider_; // Weak.
- const std::unique_ptr<Notifier> notifier_;
+ std::unique_ptr<Notifier> notifier_;
// |icon_view_| is owned by us because sometimes we don't leave it
// in the view hierarchy.
std::unique_ptr<views::ImageView> icon_view_;
@@ -96,7 +96,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
};
// Given a new list of notifiers, updates the view to reflect it.
- void UpdateContentsView(const std::vector<Notifier*>& notifiers);
+ void UpdateContentsView(std::vector<std::unique_ptr<Notifier>> notifiers);
// Overridden from views::View:
void Layout() override;
« no previous file with comments | « ui/message_center/notifier_settings.h ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698