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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months 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
Index: ui/message_center/views/message_view.h
diff --git a/ui/message_center/views/message_view.h b/ui/message_center/views/message_view.h
index 6a4754e179c68214266b21b69390877c0b4116c0..3275b05af9b3452c5cb6b6fd26419b4d3a232b36 100644
--- a/ui/message_center/views/message_view.h
+++ b/ui/message_center/views/message_view.h
@@ -5,8 +5,9 @@
#ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
#define UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -108,14 +109,14 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
std::string notification_id_;
NotifierId notifier_id_;
views::View* background_view_; // Owned by views hierarchy.
- scoped_ptr<views::ImageView> small_image_view_;
+ std::unique_ptr<views::ImageView> small_image_view_;
views::ScrollView* scroller_;
base::string16 accessible_name_;
base::string16 display_source_;
- scoped_ptr<views::Painter> focus_painter_;
+ std::unique_ptr<views::Painter> focus_painter_;
// Changes the background color being used by |background_view_| and schedules
// a paint.
« no previous file with comments | « ui/message_center/views/message_popup_collection_unittest.cc ('k') | ui/message_center/views/message_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698