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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_MESSAGE_CENTER_BOUNDED_LABEL_H_ 5 #ifndef UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
6 #define UI_MESSAGE_CENTER_BOUNDED_LABEL_H_ 6 #define UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <memory>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
14 #include "ui/message_center/message_center_export.h" 14 #include "ui/message_center/message_center_export.h"
15 #include "ui/views/view.h" 15 #include "ui/views/view.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 class FontList; 18 class FontList;
19 } 19 }
20 20
21 namespace message_center { 21 namespace message_center {
22 22
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 protected: 61 protected:
62 // Overridden from views::View. 62 // Overridden from views::View.
63 void OnBoundsChanged(const gfx::Rect& previous_bounds) override; 63 void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
64 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 64 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
65 65
66 private: 66 private:
67 friend class test::BoundedLabelTest; 67 friend class test::BoundedLabelTest;
68 68
69 base::string16 GetWrappedTextForTest(int width, int lines); 69 base::string16 GetWrappedTextForTest(int width, int lines);
70 70
71 scoped_ptr<InnerBoundedLabel> label_; 71 std::unique_ptr<InnerBoundedLabel> label_;
72 int line_limit_; 72 int line_limit_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(BoundedLabel); 74 DISALLOW_COPY_AND_ASSIGN(BoundedLabel);
75 }; 75 };
76 76
77 } // namespace message_center 77 } // namespace message_center
78 78
79 #endif // UI_MESSAGE_CENTER_BOUNDED_LABEL_H_ 79 #endif // UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
OLDNEW
« 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