ui/message_center/views/notification_view.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/message_center/views/notification_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 unified diff | Download patch

« no previous file with comments | « ui/message_center/views/notification_progress_bar.h ('k') | ui/message_center/views/notification_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_VIEWS_NOTIFICATION_VIEW_H_	5 #ifndef UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_

6 #define UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_	6 #define UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 BoundedLabel* message_view_;	130 BoundedLabel* message_view_;

131 BoundedLabel* context_message_view_;	131 BoundedLabel* context_message_view_;

132 views::ImageButton* settings_button_view_;	132 views::ImageButton* settings_button_view_;

133 std::vector<views::View*> item_views_;	133 std::vector<views::View*> item_views_;

134 ProportionalImageView* icon_view_;	134 ProportionalImageView* icon_view_;

135 views::View* bottom_view_;	135 views::View* bottom_view_;

136 views::View* image_container_;	136 views::View* image_container_;

137 ProportionalImageView* image_view_;	137 ProportionalImageView* image_view_;

138 NotificationProgressBarBase* progress_bar_view_;	138 NotificationProgressBarBase* progress_bar_view_;

139 std::vector<NotificationButton*> action_buttons_;	139 std::vector<NotificationButton*> action_buttons_;

140 scoped_ptr<views::ImageButton> close_button_;	140 std::unique_ptr<views::ImageButton> close_button_;

141 std::vector<views::View*> separators_;	141 std::vector<views::View*> separators_;

142	142

143 DISALLOW_COPY_AND_ASSIGN(NotificationView);	143 DISALLOW_COPY_AND_ASSIGN(NotificationView);

144 };	144 };

145	145

146 } // namespace message_center	146 } // namespace message_center

147	147

148 #endif // UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_	148 #endif // UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_

OLD	NEW