| Index: ui/views/focus/focus_traversal_unittest.cc
|
| diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
|
| index f1bee540cc40125b20cc54f574ac55bf8142cd48..039c2b647a314143a24aa04c40e3c1365edc3d5f 100644
|
| --- a/ui/views/focus/focus_traversal_unittest.cc
|
| +++ b/ui/views/focus/focus_traversal_unittest.cc
|
| @@ -134,7 +134,7 @@ class BorderView : public NativeViewHost {
|
| public:
|
| explicit BorderView(View* child) : child_(child), widget_(NULL) {
|
| DCHECK(child);
|
| - SetFocusable(false);
|
| + SetFocusBehavior(FocusBehavior::NEVER);
|
| }
|
|
|
| ~BorderView() override {}
|
| @@ -543,7 +543,7 @@ void FocusTraversalTest::InitContentView() {
|
| y += 60;
|
|
|
| contents = new View();
|
| - contents->SetFocusable(true);
|
| + contents->SetFocusBehavior(View::FocusBehavior::ALWAYS);
|
| contents->set_background(Background::CreateSolidBackground(SK_ColorBLUE));
|
| contents->set_id(kThumbnailContainerID);
|
| button = new LabelButton(NULL, ASCIIToUTF16("Star"));
|
| @@ -747,10 +747,11 @@ TEST_F(FocusTraversalTest, PaneTraversal) {
|
|
|
| FocusSearch focus_search_right(right_container_, true, true);
|
| right_container_->EnablePaneFocus(&focus_search_right);
|
| - FindViewByID(kRosettaLinkID)->SetFocusable(false);
|
| - FindViewByID(kStupeurEtTremblementLinkID)->SetFocusable(false);
|
| - FindViewByID(kDinerGameLinkID)->SetAccessibilityFocusable(true);
|
| - FindViewByID(kDinerGameLinkID)->SetFocusable(false);
|
| + FindViewByID(kRosettaLinkID)->SetFocusBehavior(View::FocusBehavior::NEVER);
|
| + FindViewByID(kStupeurEtTremblementLinkID)
|
| + ->SetFocusBehavior(View::FocusBehavior::NEVER);
|
| + FindViewByID(kDinerGameLinkID)
|
| + ->SetFocusBehavior(View::FocusBehavior::ACCESSIBLE_ONLY);
|
| FindViewByID(kAsterixLinkID)->RequestFocus();
|
|
|
| // Traverse the focus hierarchy within the pane several times.
|
|
|