| Index: ui/views/view_unittest.cc
|
| diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
|
| index 797d147baee34f291f121a28c21eb40d63e07c41..d972b1d5e33f5e1c28246c69d6670407e646423e 100644
|
| --- a/ui/views/view_unittest.cc
|
| +++ b/ui/views/view_unittest.cc
|
| @@ -3426,9 +3426,9 @@ TEST_F(ViewTest, ReorderChildren) {
|
| child->AddChildView(foo2);
|
| View* foo3 = new View();
|
| child->AddChildView(foo3);
|
| - foo1->SetFocusable(true);
|
| - foo2->SetFocusable(true);
|
| - foo3->SetFocusable(true);
|
| + foo1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| + foo2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| + foo3->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
|
|
| ASSERT_EQ(0, child->GetIndexOf(foo1));
|
| ASSERT_EQ(1, child->GetIndexOf(foo2));
|
| @@ -3573,10 +3573,11 @@ TEST_F(ViewTest, AdvanceFocusIfNecessaryForUnfocusableView) {
|
| widget.Init(params);
|
|
|
| View* view1 = new View();
|
| - view1->SetFocusable(true);
|
| + view1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| +
|
| widget.GetRootView()->AddChildView(view1);
|
| View* view2 = new View();
|
| - view2->SetFocusable(true);
|
| + view2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| widget.GetRootView()->AddChildView(view2);
|
|
|
| FocusManager* focus_manager = widget.GetFocusManager();
|
| @@ -3605,7 +3606,7 @@ TEST_F(ViewTest, AdvanceFocusIfNecessaryForUnfocusableView) {
|
|
|
| // Set the focused view as not focusable and check if the next view gets
|
| // focused.
|
| - view1->SetFocusable(false);
|
| + view1->SetFocusBehavior(views::View::FocusBehavior::NEVER);
|
| EXPECT_EQ(view2, focus_manager->GetFocusedView());
|
| }
|
|
|
| @@ -4368,11 +4369,11 @@ TEST_F(ViewTest, FocusableAssertions) {
|
| // that focusable() return the last value passed to SetFocusable and not
|
| // whether the View is focusable right now.
|
| TestView view;
|
| - view.SetFocusable(true);
|
| + view.SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
|
| EXPECT_TRUE(view.focusable());
|
| view.SetEnabled(false);
|
| EXPECT_TRUE(view.focusable());
|
| - view.SetFocusable(false);
|
| + view.SetFocusBehavior(views::View::FocusBehavior::NEVER);
|
| EXPECT_FALSE(view.focusable());
|
| }
|
|
|
|
|