Revert of Change focus indicator for TableView and TreeView.

ui/views/controls/tree/tree_view.cc

Index: ui/views/controls/tree/tree_view.cc
diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc
index fc7541924357eb2a0649309263639ff93ba80bb3..7e964f96c66ea799acd3547c60ee57475be07fbd 100644
--- a/ui/views/controls/tree/tree_view.cc
+++ b/ui/views/controls/tree/tree_view.cc
@@ -638,7 +638,7 @@
   if (GetInputMethod())
     GetInputMethod()->OnCaretBoundsChanged(GetPrefixSelector());
 
-  SetHasFocusIndicator(true);
+  SetHasFocusRing(true);
 }
 
 void TreeView::OnBlur() {
@@ -647,7 +647,7 @@
   SchedulePaintForNode(selected_node_);
   if (selector_)
     selector_->OnViewBlur();
-  SetHasFocusIndicator(false);
+  SetHasFocusRing(false);
 }
 
 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) {
@@ -807,6 +807,8 @@
   if (!PlatformStyle::kTreeViewSelectionPaintsEntireRow &&
       node == selected_node_) {
     canvas->FillRect(text_bounds, selected_row_bg_color);
+    if (HasFocus())
+      canvas->DrawFocusRect(text_bounds);
   }
 
   // Paint the text.
@@ -1055,13 +1057,20 @@
   return arrow_bounds.Contains(point);
 }
 
-void TreeView::SetHasFocusIndicator(bool shows) {
+void TreeView::SetHasFocusRing(bool shows) {
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial() ||
+      !PlatformStyle::kTreeViewHasFocusRing) {
+    return;
+  }
   // If this View is the grandchild of a ScrollView, use the grandparent
   // ScrollView for the focus ring instead of this View so that the focus ring
-  // won't be scrolled.
-  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
-  if (scroll_view)
-    scroll_view->SetHasFocusIndicator(shows);
+  // won't be scrolled. Since ScrollViews have a single content view, which they
+  // wrap in a ScrollView::Viewport, being the grandchild of a ScrollView
+  // implies being the sole grandchild, which means it's fine to wrap the focus
+  // ring around the grandparent here.
+  View* grandparent = parent() ? parent()->parent() : nullptr;
+  if (grandparent && grandparent->GetClassName() == ScrollView::kViewClassName)
+    static_cast<ScrollView*>(grandparent)->SetHasFocusRing(shows);
 }
 
 // InternalNode ----------------------------------------------------------------