OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "ui/message_center/views/message_center_view.h" | 5 #include "ui/message_center/views/message_center_view.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 #include <map> | 8 #include <map> |
9 | 9 |
| 10 #include "base/command_line.h" |
10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
11 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
12 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
13 #include "grit/ui_strings.h" | 14 #include "grit/ui_strings.h" |
14 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
15 #include "ui/gfx/animation/multi_animation.h" | 16 #include "ui/gfx/animation/multi_animation.h" |
16 #include "ui/gfx/animation/slide_animation.h" | 17 #include "ui/gfx/animation/slide_animation.h" |
17 #include "ui/gfx/canvas.h" | 18 #include "ui/gfx/canvas.h" |
18 #include "ui/gfx/insets.h" | 19 #include "ui/gfx/insets.h" |
19 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
20 #include "ui/gfx/size.h" | 21 #include "ui/gfx/size.h" |
21 #include "ui/message_center/message_center.h" | 22 #include "ui/message_center/message_center.h" |
22 #include "ui/message_center/message_center_style.h" | 23 #include "ui/message_center/message_center_style.h" |
| 24 #include "ui/message_center/message_center_switches.h" |
23 #include "ui/message_center/message_center_tray.h" | 25 #include "ui/message_center/message_center_tray.h" |
24 #include "ui/message_center/message_center_types.h" | 26 #include "ui/message_center/message_center_types.h" |
25 #include "ui/message_center/views/message_center_button_bar.h" | 27 #include "ui/message_center/views/message_center_button_bar.h" |
26 #include "ui/message_center/views/message_view.h" | 28 #include "ui/message_center/views/message_view.h" |
27 #include "ui/message_center/views/message_view_context_menu_controller.h" | 29 #include "ui/message_center/views/message_view_context_menu_controller.h" |
28 #include "ui/message_center/views/notification_view.h" | 30 #include "ui/message_center/views/notification_view.h" |
29 #include "ui/message_center/views/notifier_settings_view.h" | 31 #include "ui/message_center/views/notifier_settings_view.h" |
30 #include "ui/resources/grit/ui_resources.h" | 32 #include "ui/resources/grit/ui_resources.h" |
31 #include "ui/views/animation/bounds_animator.h" | 33 #include "ui/views/animation/bounds_animator.h" |
32 #include "ui/views/animation/bounds_animator_observer.h" | 34 #include "ui/views/animation/bounds_animator_observer.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 if (!animator_.get()) { | 413 if (!animator_.get()) { |
412 animator_.reset(new views::BoundsAnimator(this)); | 414 animator_.reset(new views::BoundsAnimator(this)); |
413 animator_->AddObserver(this); | 415 animator_->AddObserver(this); |
414 } | 416 } |
415 | 417 |
416 if (!clearing_all_views_.empty()) { | 418 if (!clearing_all_views_.empty()) { |
417 AnimateClearingOneNotification(); | 419 AnimateClearingOneNotification(); |
418 return; | 420 return; |
419 } | 421 } |
420 | 422 |
421 if (top_down_) | 423 if (top_down_ || |
| 424 CommandLine::ForCurrentProcess()->HasSwitch( |
| 425 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)) |
422 AnimateNotificationsBelowTarget(); | 426 AnimateNotificationsBelowTarget(); |
423 else | 427 else |
424 AnimateNotificationsAboveTarget(); | 428 AnimateNotificationsAboveTarget(); |
425 | 429 |
426 adding_views_.clear(); | 430 adding_views_.clear(); |
427 deleting_views_.clear(); | 431 deleting_views_.clear(); |
428 } | 432 } |
429 | 433 |
430 void MessageListView::AnimateNotificationsBelowTarget() { | 434 void MessageListView::AnimateNotificationsBelowTarget() { |
431 int last_index = -1; | 435 int last_index = -1; |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
997 scroller_->InvalidateLayout(); | 1001 scroller_->InvalidateLayout(); |
998 PreferredSizeChanged(); | 1002 PreferredSizeChanged(); |
999 Layout(); | 1003 Layout(); |
1000 } | 1004 } |
1001 | 1005 |
1002 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { | 1006 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { |
1003 message_list_view_->AddNotificationAt(view, 0); | 1007 message_list_view_->AddNotificationAt(view, 0); |
1004 } | 1008 } |
1005 | 1009 |
1006 } // namespace message_center | 1010 } // namespace message_center |
OLD | NEW |