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

Side by Side Diff: ui/message_center/views/message_list_view.h

Issue 1187003002: Retires scoped_ptr for BoundsAnimator of message_list_view. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | ui/message_center/views/message_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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_MESSAGE_LIST_VIEW_H_ 5 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_LIST_VIEW_H_
6 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_LIST_VIEW_H_ 6 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_LIST_VIEW_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 10
11 #include "ui/compositor/paint_context.h" 11 #include "ui/compositor/paint_context.h"
12 #include "ui/gfx/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
14 #include "ui/message_center/notification.h" 14 #include "ui/message_center/notification.h"
15 #include "ui/views/animation/bounds_animator.h"
15 #include "ui/views/animation/bounds_animator_observer.h" 16 #include "ui/views/animation/bounds_animator_observer.h"
16 #include "ui/views/view.h" 17 #include "ui/views/view.h"
17 18
18 namespace gfx { 19 namespace gfx {
19 class Canvas; 20 class Canvas;
20 } 21 }
21 22
22 namespace ui { 23 namespace ui {
23 class Layer; 24 class Layer;
24 } 25 }
25 26
26 namespace views {
27 class BoundsAnimator;
28 }
29
30 namespace message_center { 27 namespace message_center {
31 28
32 class MessageCenterView; 29 class MessageCenterView;
33 class MessageView; 30 class MessageView;
34 31
35 // Displays a list of messages for rich notifications. Functions as an array of 32 // Displays a list of messages for rich notifications. Functions as an array of
36 // MessageViews and animates them on transitions. It also supports 33 // MessageViews and animates them on transitions. It also supports
37 // repositioning. 34 // repositioning.
38 class MessageListView : public views::View, 35 class MessageListView : public views::View,
39 public views::BoundsAnimatorObserver { 36 public views::BoundsAnimatorObserver {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // The top position of the reposition target rectangle. 83 // The top position of the reposition target rectangle.
87 int reposition_top_; 84 int reposition_top_;
88 int fixed_height_; 85 int fixed_height_;
89 bool has_deferred_task_; 86 bool has_deferred_task_;
90 bool clear_all_started_; 87 bool clear_all_started_;
91 bool top_down_; 88 bool top_down_;
92 std::set<views::View*> adding_views_; 89 std::set<views::View*> adding_views_;
93 std::set<views::View*> deleting_views_; 90 std::set<views::View*> deleting_views_;
94 std::set<views::View*> deleted_when_done_; 91 std::set<views::View*> deleted_when_done_;
95 std::list<views::View*> clearing_all_views_; 92 std::list<views::View*> clearing_all_views_;
96 scoped_ptr<views::BoundsAnimator> animator_; 93 views::BoundsAnimator animator_;
97 base::WeakPtrFactory<MessageListView> weak_ptr_factory_; 94 base::WeakPtrFactory<MessageListView> weak_ptr_factory_;
98 95
99 DISALLOW_COPY_AND_ASSIGN(MessageListView); 96 DISALLOW_COPY_AND_ASSIGN(MessageListView);
100 }; 97 };
101 98
102 } // namespace message_center 99 } // namespace message_center
103 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_LIST_VIEW_H_ 100 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/message_center/views/message_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698