| OLD | NEW |
| 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 #include "ui/message_center/views/message_center_view.h" | 5 #include "ui/message_center/views/message_center_view.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 229 |
| 230 // Wait until the animation finishes if available. | 230 // Wait until the animation finishes if available. |
| 231 if (GetAnimator()->IsAnimating()) | 231 if (GetAnimator()->IsAnimating()) |
| 232 base::MessageLoop::current()->Run(); | 232 base::MessageLoop::current()->Run(); |
| 233 } | 233 } |
| 234 | 234 |
| 235 void MessageCenterViewTest::TearDown() { | 235 void MessageCenterViewTest::TearDown() { |
| 236 widget_->CloseNow(); | 236 widget_->CloseNow(); |
| 237 widget_.reset(); | 237 widget_.reset(); |
| 238 message_center_view_.reset(); | 238 message_center_view_.reset(); |
| 239 STLDeleteElements(¬ifications_); | 239 base::STLDeleteElements(¬ifications_); |
| 240 views::ViewsTestBase::TearDown(); | 240 views::ViewsTestBase::TearDown(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 MessageCenterView* MessageCenterViewTest::GetMessageCenterView() { | 243 MessageCenterView* MessageCenterViewTest::GetMessageCenterView() { |
| 244 return message_center_view_.get(); | 244 return message_center_view_.get(); |
| 245 } | 245 } |
| 246 | 246 |
| 247 MessageListView* MessageCenterViewTest::GetMessageListView() { | 247 MessageListView* MessageCenterViewTest::GetMessageListView() { |
| 248 return message_center_view_->message_list_view_.get(); | 248 return message_center_view_->message_list_view_.get(); |
| 249 } | 249 } |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 base::UTF8ToUTF16("message"), | 800 base::UTF8ToUTF16("message"), |
| 801 gfx::Image(), base::UTF8ToUTF16("display source"), GURL(), | 801 gfx::Image(), base::UTF8ToUTF16("display source"), GURL(), |
| 802 NotifierId(NotifierId::APPLICATION, "extension_id"), | 802 NotifierId(NotifierId::APPLICATION, "extension_id"), |
| 803 message_center::RichNotificationData(), NULL))); | 803 message_center::RichNotificationData(), NULL))); |
| 804 | 804 |
| 805 GetMessageCenterView()->SizeToPreferredSize(); | 805 GetMessageCenterView()->SizeToPreferredSize(); |
| 806 EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height()); | 806 EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height()); |
| 807 } | 807 } |
| 808 | 808 |
| 809 } // namespace message_center | 809 } // namespace message_center |
| OLD | NEW |