Views: Add new SetFocusBehavior method.

ui/views/view.cc

Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 60d8e8903e3da79516583d4539c5417e9c6f177e..9993fcc3504574f97511ecca8519809464d4a441 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1199,12 +1199,21 @@ void View::SetNextFocusableView(View* view) {
   next_focusable_view_ = view;
 }
 
-void View::SetFocusable(bool focusable) {
-  if (focusable_ == focusable)
-    return;
-
-  focusable_ = focusable;
-  AdvanceFocusIfNecessary();
+void View::SetFocusBehavior(FocusBehavior focus_behavior) {
+  switch (focus_behavior) {

[tapted, 2016/04/20 04:16:28]

since SetFocusable/SetAccessibilityFocusable are being removed from the public
API, I don't think the helpers add much.

E.g. this could be written

  bool focusable = focus_behavior == FocusBehavior::ALWAYS;
  bool accessibility_focusable = focus_behavior != FocusBehavior::NEVER;
  if (focusable == focusable_ &&
      accessibility_focusable == accessibility_focusable_)
    return;

  focusable_ = focusable;
  accessibility_focusable_ = accessibility_focusable;
  AdvanceFocusIfNecessary();


But actually I think there's no extra churn if we simply remove the two `bool`
members and replace it with a focus_behavior_ member. This method becomes even
neater, and we only need to change IsFocusable() and IsAccessibilityFocusable()
below.

i.e.

IsFocusable() {
  return focus_behaviour_ == FocusBehavior::ALWAYS && enabled_ && IsDrawn();
}

IsAccessibilityFocusable() {
  return focus_behaviour_ != FocusBehavior::NEVER && enabled_ && IsDrawn();
}


This way it's impossible to enter the meaningless state of focusable = true,
accessibilty_focusable = false.

[karandeepb, 2016/04/21 03:16:33]

Yeah should have thought of this. Thanks.

+    case FocusBehavior::ALWAYS:
+      SetFocusable(true);
+      SetAccessibilityFocusable(true);
+      break;
+    case FocusBehavior::NEVER:
+      SetFocusable(false);
+      SetAccessibilityFocusable(false);
+      break;
+    case FocusBehavior::ACCESSIBLE_ONLY:
+      SetFocusable(false);
+      SetAccessibilityFocusable(true);
+      break;
+  }
 }
 
 bool View::IsFocusable() const {
@@ -1215,14 +1224,6 @@ bool View::IsAccessibilityFocusable() const {
   return (focusable_ || accessibility_focusable_) && enabled_ && IsDrawn();
 }
 
-void View::SetAccessibilityFocusable(bool accessibility_focusable) {
-  if (accessibility_focusable_ == accessibility_focusable)
-    return;
-
-  accessibility_focusable_ = accessibility_focusable;
-  AdvanceFocusIfNecessary();
-}
-
 FocusManager* View::GetFocusManager() {
   Widget* widget = GetWidget();
   return widget ? widget->GetFocusManager() : NULL;
@@ -2309,6 +2310,22 @@ void View::UnregisterAccelerators(bool leave_data_intact) {
 
 // Focus -----------------------------------------------------------------------
 
+void View::SetFocusable(bool focusable) {
+  if (focusable_ == focusable)
+    return;
+
+  focusable_ = focusable;
+  AdvanceFocusIfNecessary();
+}
+
+void View::SetAccessibilityFocusable(bool accessibility_focusable) {
+  if (accessibility_focusable_ == accessibility_focusable)
+    return;
+
+  accessibility_focusable_ = accessibility_focusable;
+  AdvanceFocusIfNecessary();
+}
+
 void View::InitFocusSiblings(View* v, int index) {
   int count = child_count();