Views: Add new SetFocusBehavior method.

ui/views/view.h

 // 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.
 
 #ifndef UI_VIEWS_VIEW_H_
 #define UI_VIEWS_VIEW_H_
 
 #include <stddef.h>
 
 #include <algorithm>
@@ skipping 98 matching lines @@
 //
 /////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT View : public ui::LayerDelegate,
                           public ui::LayerOwner,
                           public ui::AcceleratorTarget,
                           public ui::EventTarget,
                           public ui::EventHandler {
  public:
   typedef std::vector<View*> Views;
 
+  enum class FocusBehavior {
+    // Use when the View is never focusable. Default.
+    NEVER,
+
+    // Use when the View is to be focusable both in regular and accessibility
+    // mode.
+    ALWAYS,
+
+    // Use when the View is focusable only during accessibility mode.
+    ACCESSIBLE_ONLY,
+  };
+
   struct ViewHierarchyChangedDetails {
     ViewHierarchyChangedDetails()
         : is_add(false),
           parent(NULL),
           child(NULL),
           move_view(NULL) {}
 
     ViewHierarchyChangedDetails(bool is_add,
                                 View* parent,
                                 View* child,
@@ skipping 631 matching lines @@
   // Returns the view that should be selected next when pressing Shift-Tab.
   View* GetPreviousFocusableView();
 
   // Sets the component that should be selected next when pressing Tab, and
   // makes the current view the precedent view of the specified one.
   // Note that by default views are linked in the order they have been added to
   // their container. Use this method if you want to modify the order.
   // IMPORTANT NOTE: loops in the focus hierarchy are not supported.
   void SetNextFocusableView(View* view);
 
-  // Sets whether this view is capable of taking focus. It will clear focus if
-  // the focused view is set to be non-focusable.
-  // Note that this is false by default so that a view used as a container does
-  // not get the focus.
-  void SetFocusable(bool focusable);
+  // Sets |focus_behavior| and advances focus if necessary.
+  void SetFocusBehavior(FocusBehavior focus_behavior);
 
-  // Returns true if this view is |focusable_|, |enabled_| and drawn.
+  // Returns true if this view is focusable, |enabled_| and drawn.
   bool IsFocusable() const;
 
   // Return whether this view is focusable when the user requires full keyboard
   // access, even though it may not be normally focusable.
   bool IsAccessibilityFocusable() const;
 
-  // Set whether this view can be made focusable if the user requires
-  // full keyboard access, even though it's not normally focusable. It will
-  // clear focus if the focused view is set to be non-focusable.
-  // Note that this is false by default.
-  void SetAccessibilityFocusable(bool accessibility_focusable);
-
   // Convenience method to retrieve the FocusManager associated with the
   // Widget that contains this view.  This can return NULL if this view is not
   // part of a view hierarchy with a Widget.
   virtual FocusManager* GetFocusManager();
   virtual const FocusManager* GetFocusManager() const;
 
   // Request keyboard focus. The receiving view will become the focused view.
   virtual void RequestFocus();
 
   // Invoked when a view is about to be requested for focus due to the focus
@@ skipping 335 matching lines @@
   // with an associated view. Widget::ReorderNativeViews() may reorder layers
   // below layers owned by a view.
   virtual void ReorderChildLayers(ui::Layer* parent_layer);
 
   // Input ---------------------------------------------------------------------
 
   virtual DragInfo* GetDragInfo();
 
   // Focus ---------------------------------------------------------------------
 
-  // Returns last value passed to SetFocusable(). Use IsFocusable() to determine
-  // if a view can take focus right now.
-  bool focusable() const { return focusable_; }
+  // Returns true if ALWAYS is the last set focus behavior. Use IsFocusable() to
+  // determine if a view can take focus right now.
+  bool focusable() const { return focus_behavior_ == FocusBehavior::ALWAYS; }
 
   // Override to be notified when focus has changed either to or from this View.
   virtual void OnFocus();
   virtual void OnBlur();
 
   // Handle view focus/blur events for this view.
   void Focus();
   void Blur();
 
   // System events -------------------------------------------------------------
@@ skipping 380 matching lines @@
   size_t registered_accelerator_count_;
 
   // Focus ---------------------------------------------------------------------
 
   // Next view to be focused when the Tab key is pressed.
   View* next_focusable_view_;
 
   // Next view to be focused when the Shift-Tab key combination is pressed.
   View* previous_focusable_view_;
 
-  // Whether this view can be focused.
-  bool focusable_;
-
-  // Whether this view is focusable if the user requires full keyboard access,
-  // even though it may not be normally focusable.
-  bool accessibility_focusable_;
+  // The focus behavior of the view in regular and accessibility mode.
+  FocusBehavior focus_behavior_;
 
   // Context menus -------------------------------------------------------------
 
   // The menu controller.
   ContextMenuController* context_menu_controller_;
 
   // Drag and drop -------------------------------------------------------------
 
   DragController* drag_controller_;
 
   // Input  --------------------------------------------------------------------
 
   std::unique_ptr<ViewTargeter> targeter_;
 
   // Accessibility -------------------------------------------------------------
 
   // Belongs to this view, but it's reference-counted on some platforms
   // so we can't use a scoped_ptr. It's dereferenced in the destructor.
   NativeViewAccessibility* native_view_accessibility_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEW_H_