views: add focus ring to TreeView

ui/views/controls/scroll_view.cc

Index: ui/views/controls/scroll_view.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index 68ee68fee3eaa8561e097be266a8ec202f448155..ca56c4c9113e0e40edd46df02f5746692bee65eb 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -12,6 +12,7 @@
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/focus_ring.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 
@@ -271,6 +272,19 @@ void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) {
   vert_sb_ = vert_sb;
 }
 
+void ScrollView::SetHasFocusRing(bool has_focus_ring) {
+  if (has_focus_ring == bool(focus_ring_))

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

Why not just focus_ring_?

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

It doesn't compile:

../../ui/views/controls/scroll_view.cc:276:22: error: comparison between pointer
and integer ('int' and 'views::View *')

[sky, 2016/10/13 17:39:45]

My mistake.

+    return;
+  if (has_focus_ring) {
+    focus_ring_ = new FocusRing;
+    AddChildView(focus_ring_);
+    focus_ring_->Layout();
+  } else {
+    delete focus_ring_;
+    focus_ring_ = nullptr;
+  }
+}
+
 gfx::Size ScrollView::GetPreferredSize() const {
   if (!is_bounded())
     return View::GetPreferredSize();
@@ -294,6 +308,9 @@ int ScrollView::GetHeightForWidth(int width) const {
 }
 
 void ScrollView::Layout() {
+  if (focus_ring_)
+    focus_ring_->Layout();
+
   gfx::Rect available_rect = GetContentsBounds();
   if (is_bounded()) {
     int content_width = available_rect.width();