| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ash/popup_message.h" | 5 #include "ash/common/popup_message.h" |
| 6 | 6 |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "ui/views/controls/label.h" | 9 #include "ui/views/controls/label.h" |
| 10 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 | 13 |
| 14 using PopupMessageTest = test::AshTestBase; | 14 using PopupMessageTest = test::AshTestBase; |
| 15 | 15 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 42 EXPECT_GE(caption_label->height(), | 42 EXPECT_GE(caption_label->height(), |
| 43 caption_label->GetHeightForWidth(caption_label->width())); | 43 caption_label->GetHeightForWidth(caption_label->width())); |
| 44 EXPECT_GE(message_label->height(), | 44 EXPECT_GE(message_label->height(), |
| 45 message_label->GetHeightForWidth(message_label->width())); | 45 message_label->GetHeightForWidth(message_label->width())); |
| 46 | 46 |
| 47 message.Close(); | 47 message.Close(); |
| 48 widget->Close(); | 48 widget->Close(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace ash | 51 } // namespace ash |
| OLD | NEW |