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

Unified Diff: ui/message_center/views/bounded_label.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
« no previous file with comments | « ui/message_center/popup_timers_controller.cc ('k') | ui/message_center/views/bounded_label_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/bounded_label.h
diff --git a/ui/message_center/views/bounded_label.h b/ui/message_center/views/bounded_label.h
index c1cac4ea151195d983a018a60280a1952499df74..0dff0291637e22a3da4a0bb7c58b3f2b998fd804 100644
--- a/ui/message_center/views/bounded_label.h
+++ b/ui/message_center/views/bounded_label.h
@@ -7,9 +7,9 @@
#include <list>
#include <map>
+#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/message_center/message_center_export.h"
#include "ui/views/view.h"
@@ -68,7 +68,7 @@ class MESSAGE_CENTER_EXPORT BoundedLabel : public views::View {
base::string16 GetWrappedTextForTest(int width, int lines);
- scoped_ptr<InnerBoundedLabel> label_;
+ std::unique_ptr<InnerBoundedLabel> label_;
int line_limit_;
DISALLOW_COPY_AND_ASSIGN(BoundedLabel);
« no previous file with comments | « ui/message_center/popup_timers_controller.cc ('k') | ui/message_center/views/bounded_label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698