| Index: ui/views/controls/label_unittest.cc
|
| diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
|
| index ef896fdccc6cc9d80bad753161fd5aa1c7b473c8..1f3d61d597659b67e4fe9a0f8cef22a0f9f43f59 100644
|
| --- a/ui/views/controls/label_unittest.cc
|
| +++ b/ui/views/controls/label_unittest.cc
|
| @@ -376,7 +376,7 @@ TEST_F(LabelTest, PreferredSizeForAllowCharacterBreak) {
|
|
|
| TEST_F(LabelTest, MultiLineSizing) {
|
| Label label;
|
| - label.SetFocusable(false);
|
| + label.SetFocusBehavior(views::View::FocusBehavior::NEVER);
|
| label.SetText(
|
| ASCIIToUTF16("A random string\nwith multiple lines\nand returns!"));
|
| label.SetMultiLine(true);
|
| @@ -461,7 +461,7 @@ TEST_F(LabelTest, MultiLineSizingWithElide) {
|
| const base::string16 text =
|
| ASCIIToUTF16("A random string\nwith multiple lines\nand returns!");
|
| Label label;
|
| - label.SetFocusable(false);
|
| + label.SetFocusBehavior(views::View::FocusBehavior::NEVER);
|
| label.SetText(text);
|
| label.SetMultiLine(true);
|
|
|
| @@ -612,7 +612,7 @@ TEST_F(LabelFocusTest, FocusBounds) {
|
| label()->SetText(ASCIIToUTF16("Example"));
|
| gfx::Size normal_size = label()->GetPreferredSize();
|
|
|
| - label()->SetFocusable(true);
|
| + label()->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| label()->RequestFocus();
|
| gfx::Size focusable_size = label()->GetPreferredSize();
|
| // Focusable label requires larger size to paint the focus rectangle.
|
| @@ -649,7 +649,7 @@ TEST_F(LabelFocusTest, FocusBounds) {
|
| }
|
|
|
| TEST_F(LabelFocusTest, EmptyLabel) {
|
| - label()->SetFocusable(true);
|
| + label()->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| label()->RequestFocus();
|
| label()->SizeToPreferredSize();
|
|
|
|
|