MacViews: support backgrounds for selected rows

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>
 
@@ skipping 276 matching lines @@
   void PaintExpandControl(gfx::Canvas* canvas,
                           const gfx::Rect& node_bounds,
                           bool expanded);
 
   // Returns the InternalNode for a model node. |create_type| indicates wheter
   // this should load InternalNode or not.
   InternalNode* GetInternalNodeForModelNode(
       ui::TreeModelNode* model_node,
       GetInternalNodeCreateType create_type);
 
-  // Returns the bounds for a node.
-  gfx::Rect GetBoundsForNode(InternalNode* node);
+  // Returns the bounds for a node's background.
+  gfx::Rect GetBackgroundBoundsForNode(InternalNode* node);
 
-  // Implementation of GetBoundsForNode. Separated out as some callers already
-  // know the row/depth.
-  gfx::Rect GetBoundsForNodeImpl(InternalNode* node, int row, int depth);
+  // Return the bounds for a node's foreground, which is the part containing the
+  // expand/collapse symbol (if any), the icon (if any), and the text label.
+  gfx::Rect GetForegroundBoundsForNode(InternalNode* node);
+
+  // Returns the bounds for a node's text label.
+  gfx::Rect GetTextBoundsForNode(InternalNode* node);
+
+  // Implementation of GetTextBoundsForNode. Separated out as some callers
+  // already know the row/depth.
+  gfx::Rect GetForegroundBoundsForNodeImpl(InternalNode* node,
+                                           int row,
+                                           int depth);
 
   // Returns the row and depth of a node.
   int GetRowForInternalNode(InternalNode* node, int* depth);
 
   // Returns the row and depth of the specified node.
   InternalNode* GetNodeByRow(int row, int* depth);
 
   // Implementation of GetNodeByRow. |curent_row| is updated as we iterate.
   InternalNode* GetNodeByRowImpl(InternalNode* node,
                                  int target_row,
@@ skipping 11 matching lines @@
   // If the selected node is collapsed, it's expanded. Otherwise the first child
   // is seleected.
   void ExpandOrSelectChild();
 
   // 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 the InternalNode (if any) lying under |point|. If no node lies
+  // under |point|, this function returns nullptr.
+  InternalNode* NodeAtPoint(const gfx::Point& point);

[sky, 2016/06/16 17:34:39]

GetNodeAtPoint and put above GetNodeByRow. Also make it clear this uses the
foreground bounds.

[Elly Fong-Jones, 2016/06/23 19:47:13]

Done.

+
+  // Returns whether |point| is in the bounds of |node|'s expand/collapse arrow.
+  bool HitsNodeArrow(InternalNode* node, const gfx::Point& point);

[sky, 2016/06/16 17:34:39]

nit: arrow refers to a specific rendering and isn't necessarily the same. How
about IsPointInExpandControl?

[Elly Fong-Jones, 2016/06/23 19:47:13]

Done.

+
   // 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_