Views: Add new SetFocusBehavior method.

ui/views/view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/view.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 3408 matching lines @@
 
   View* child = new View();
   root.AddChildView(child);
 
   View* foo1 = new View();
   child->AddChildView(foo1);
   View* foo2 = new View();
   child->AddChildView(foo2);
   View* foo3 = new View();
   child->AddChildView(foo3);
-  foo1->SetFocusable(true);
-  foo2->SetFocusable(true);
-  foo3->SetFocusable(true);
+  foo1->SetFocusBehavior(View::FocusBehavior::ALWAYS);
+  foo2->SetFocusBehavior(View::FocusBehavior::ALWAYS);
+  foo3->SetFocusBehavior(View::FocusBehavior::ALWAYS);
 
   ASSERT_EQ(0, child->GetIndexOf(foo1));
   ASSERT_EQ(1, child->GetIndexOf(foo2));
   ASSERT_EQ(2, child->GetIndexOf(foo3));
   ASSERT_EQ(foo2, foo1->GetNextFocusableView());
   ASSERT_EQ(foo3, foo2->GetNextFocusableView());
   ASSERT_EQ(NULL, foo3->GetNextFocusableView());
 
   // Move |foo2| at the end.
   child->ReorderChildView(foo2, -1);
@@ skipping 124 matching lines @@
 };
 
 TEST_F(ViewTest, AdvanceFocusIfNecessaryForUnfocusableView) {
   // Create a widget with two views and give the first one focus.
   ActiveWidget widget;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget.Init(params);
 
   View* view1 = new View();
-  view1->SetFocusable(true);
+  view1->SetFocusBehavior(View::FocusBehavior::ALWAYS);
+
   widget.GetRootView()->AddChildView(view1);
   View* view2 = new View();
-  view2->SetFocusable(true);
+  view2->SetFocusBehavior(View::FocusBehavior::ALWAYS);
   widget.GetRootView()->AddChildView(view2);
 
   FocusManager* focus_manager = widget.GetFocusManager();
   ASSERT_TRUE(focus_manager);
 
   focus_manager->SetFocusedView(view1);
   EXPECT_EQ(view1, focus_manager->GetFocusedView());
 
   // Disable the focused view and check if the next view gets focused.
   view1->SetEnabled(false);
   EXPECT_EQ(view2, focus_manager->GetFocusedView());
 
   // Re-enable and re-focus.
   view1->SetEnabled(true);
   focus_manager->SetFocusedView(view1);
   EXPECT_EQ(view1, focus_manager->GetFocusedView());
 
   // Hide the focused view and check it the next view gets focused.
   view1->SetVisible(false);
   EXPECT_EQ(view2, focus_manager->GetFocusedView());
 
   // Re-show and re-focus.
   view1->SetVisible(true);
   focus_manager->SetFocusedView(view1);
   EXPECT_EQ(view1, focus_manager->GetFocusedView());
 
   // Set the focused view as not focusable and check if the next view gets
   // focused.
-  view1->SetFocusable(false);
+  view1->SetFocusBehavior(View::FocusBehavior::NEVER);
   EXPECT_EQ(view2, focus_manager->GetFocusedView());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Layers
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // Test implementation of LayerAnimator.
@@ skipping 737 matching lines @@
   EXPECT_EQ("0.33 0.33", ToString(v11->layer()->subpixel_position_offset()));
 
   // Setting integral DSF should reset the offset.
   GetRootLayer()->GetCompositor()->SetScaleAndSize(2.0f, size);
   EXPECT_EQ("0.00 0.00", ToString(v11->layer()->subpixel_position_offset()));
 }
 
 TEST_F(ViewTest, FocusableAssertions) {
   // View subclasses may change insets based on whether they are focusable,
   // which effects the preferred size. To avoid preferred size changing around
-  // these Views need to key off the last value set to SetFocusable(), not
+  // these Views need to key off the last value set to SetFocusBehavior(), not
   // whether the View is focusable right now. For this reason it's important
-  // that focusable() return the last value passed to SetFocusable and not
-  // whether the View is focusable right now.
+  // that the return value of focusable() depends on the last value passed to
+  // SetFocusBehavior and not whether the View is focusable right now.
   TestView view;
-  view.SetFocusable(true);
+  view.SetFocusBehavior(View::FocusBehavior::ALWAYS);
   EXPECT_TRUE(view.focusable());
   view.SetEnabled(false);
   EXPECT_TRUE(view.focusable());
-  view.SetFocusable(false);
+  view.SetFocusBehavior(View::FocusBehavior::NEVER);
   EXPECT_FALSE(view.focusable());
 }
 
 // Verifies when a view is deleted it is removed from ViewStorage.
 TEST_F(ViewTest, UpdateViewStorageOnDelete) {
   ViewStorage* view_storage = ViewStorage::GetInstance();
   const int storage_id = view_storage->CreateStorageID();
   {
     View view;
     view_storage->StoreView(storage_id, &view);
@@ skipping 179 matching lines @@
   widget.Init(params);
 
   AddViewWithChildLayer(widget.GetRootView());
   ViewThatAddsViewInOnNativeThemeChanged* v =
       new ViewThatAddsViewInOnNativeThemeChanged;
   widget.GetRootView()->AddChildView(v);
   EXPECT_TRUE(v->on_native_theme_changed_called());
 }
 
 }  // namespace views