Index: ui/views/controls/label_unittest.cc |
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc |
index 0b5869a7eb19651f8415af56fed49d4ac9168fd8..455ee180c521f7fe78476dccd8af68b21d7ec288 100644 |
--- a/ui/views/controls/label_unittest.cc |
+++ b/ui/views/controls/label_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "ui/compositor/canvas_painter.h" |
#include "ui/gfx/canvas.h" |
#include "ui/views/border.h" |
+#include "ui/views/controls/link.h" |
#include "ui/views/test/focus_manager_test.h" |
#include "ui/views/test/views_test_base.h" |
#include "ui/views/widget/widget.h" |
@@ -36,7 +37,8 @@ class LabelFocusTest : public FocusManagerTest { |
private: |
// FocusManagerTest: |
void InitContentView() override { |
- label_ = new views::Label(); |
+ // A link is a focusable label. |
+ label_ = new views::Link(); |
GetContentsView()->AddChildView(label_); |
} |
@@ -608,14 +610,8 @@ TEST_F(LabelTest, MultilineSupportedRenderText) { |
TEST_F(LabelFocusTest, FocusBounds) { |
label()->SetText(ASCIIToUTF16("Example")); |
- gfx::Size normal_size = label()->GetPreferredSize(); |
- |
- label()->SetFocusBehavior(View::FocusBehavior::ALWAYS); |
label()->RequestFocus(); |
gfx::Size focusable_size = label()->GetPreferredSize(); |
- // Focusable label requires larger size to paint the focus rectangle. |
- EXPECT_GT(focusable_size.width(), normal_size.width()); |
- EXPECT_GT(focusable_size.height(), normal_size.height()); |
label()->SizeToPreferredSize(); |
gfx::Rect focus_bounds = label()->GetFocusBounds(); |
@@ -646,14 +642,4 @@ TEST_F(LabelFocusTest, FocusBounds) { |
EXPECT_EQ(focusable_size.width() / 2, focus_bounds.width()); |
} |
-TEST_F(LabelFocusTest, EmptyLabel) { |
karandeepb
2016/04/27 08:04:40
An empty link is not focusable. Hence this test ca
|
- label()->SetFocusBehavior(View::FocusBehavior::ALWAYS); |
- label()->RequestFocus(); |
- label()->SizeToPreferredSize(); |
- |
- gfx::Rect focus_bounds = label()->GetFocusBounds(); |
- EXPECT_FALSE(focus_bounds.IsEmpty()); |
- EXPECT_LT(label()->font_list().GetHeight(), focus_bounds.height()); |
-} |
- |
} // namespace views |