| OLD | NEW |
| 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 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "ui/gfx/animation/slide_animation.h" | 6 #include "ui/gfx/animation/slide_animation.h" |
| 7 #include "ui/message_center/message_center_style.h" | 7 #include "ui/message_center/message_center_style.h" |
| 8 #include "ui/message_center/message_center_switches.h" | 8 #include "ui/message_center/message_center_switches.h" |
| 9 #include "ui/message_center/views/message_center_view.h" | 9 #include "ui/message_center/views/message_center_view.h" |
| 10 #include "ui/message_center/views/message_list_view.h" | 10 #include "ui/message_center/views/message_list_view.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 227 |
| 228 if (has_deferred_task_) { | 228 if (has_deferred_task_) { |
| 229 has_deferred_task_ = false; | 229 has_deferred_task_ = false; |
| 230 DoUpdateIfPossible(); | 230 DoUpdateIfPossible(); |
| 231 } | 231 } |
| 232 | 232 |
| 233 if (GetWidget()) | 233 if (GetWidget()) |
| 234 GetWidget()->SynthesizeMouseMoveEvent(); | 234 GetWidget()->SynthesizeMouseMoveEvent(); |
| 235 | 235 |
| 236 if (quit_message_loop_after_animation_for_test_) | 236 if (quit_message_loop_after_animation_for_test_) |
| 237 base::MessageLoop::current()->Quit(); | 237 base::MessageLoop::current()->QuitWhenIdle(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 bool MessageListView::IsValidChild(const views::View* child) const { | 240 bool MessageListView::IsValidChild(const views::View* child) const { |
| 241 return child->visible() && | 241 return child->visible() && |
| 242 deleting_views_.find(const_cast<views::View*>(child)) == | 242 deleting_views_.find(const_cast<views::View*>(child)) == |
| 243 deleting_views_.end() && | 243 deleting_views_.end() && |
| 244 deleted_when_done_.find(const_cast<views::View*>(child)) == | 244 deleted_when_done_.find(const_cast<views::View*>(child)) == |
| 245 deleted_when_done_.end(); | 245 deleted_when_done_.end(); |
| 246 } | 246 } |
| 247 | 247 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 base::TimeDelta::FromMilliseconds( | 429 base::TimeDelta::FromMilliseconds( |
| 430 kAnimateClearingNextNotificationDelayMS)); | 430 kAnimateClearingNextNotificationDelayMS)); |
| 431 } | 431 } |
| 432 } | 432 } |
| 433 | 433 |
| 434 void MessageListView::SetRepositionTargetForTest(const gfx::Rect& target_rect) { | 434 void MessageListView::SetRepositionTargetForTest(const gfx::Rect& target_rect) { |
| 435 SetRepositionTarget(target_rect); | 435 SetRepositionTarget(target_rect); |
| 436 } | 436 } |
| 437 | 437 |
| 438 } // namespace message_center | 438 } // namespace message_center |
| OLD | NEW |