views: add focus ring to TreeView

ui/views/controls/tree/tree_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_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
 #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/prefix_delegate.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Rect;
 }  // namespace gfx
 
 namespace views {
 
+class PrefixSelector;
+class ScrollView;
 class Textfield;
 class TreeViewController;
-class PrefixSelector;
 
 // TreeView displays hierarchical data as returned from a TreeModel. The user
 // can expand, collapse and edit the items. A Controller may be attached to
 // receive notification of selection changes and restrict editing.
 //
 // Note on implementation. This implementation doesn't scale well. In particular
 // it does not store any row information, but instead calculates it as
 // necessary. But it's more than adequate for current uses.
 class VIEWS_EXPORT TreeView : public View,
                               public ui::TreeModelObserver,
@@ skipping 302 matching lines @@
   // Implementation of Expand(). Returns true if at least one node was expanded
   // that previously wasn't.
   bool ExpandImpl(ui::TreeModelNode* model_node);
 
   PrefixSelector* GetPrefixSelector();
 
   // Returns whether |point| is in the bounds of |node|'s expand/collapse
   // control.
   bool IsPointInExpandControl(InternalNode* node, const gfx::Point& point);
 
+  // Returns the View that the focus ring for this TreeView should be drawn
+  // around.
+  ScrollView* FindFocusRingView();

[sky, 2016/10/12 23:58:01]

This function is mildly confusing as based on name I expect it to find the
FocusRing, but that isn't the case. I think either name it
GetFocusRingContainerView() or possibly GetScrollView() as that is what it does
too.

[Elly Fong-Jones, 2016/10/13 11:14:56]

It is gone now and its logic moved into TreeView::SetHasFocusRing().

+
   // The model, may be null.
   ui::TreeModel* model_;
 
   // Default icons for closed/open.
   gfx::ImageSkia closed_icon_;
   gfx::ImageSkia open_icon_;
 
   // Icons from the model.
   std::vector<gfx::ImageSkia> icons_;
 
@@ skipping 43 matching lines @@
   int text_offset_;
 
   std::unique_ptr<PrefixSelector> selector_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_