Change focus indicator for TableView and TreeView.

ui/views/controls/tree/tree_view.cc

 // 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.
 
 #include "ui/views/controls/tree/tree_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
@@ skipping 620 matching lines @@
 void TreeView::OnFocus() {
   if (GetInputMethod())
     GetInputMethod()->SetFocusedTextInputClient(GetPrefixSelector());
   View::OnFocus();
   SchedulePaintForNode(selected_node_);
 
   // Notify the InputMethod so that it knows to query the TextInputClient.
   if (GetInputMethod())
     GetInputMethod()->OnCaretBoundsChanged(GetPrefixSelector());
 
-  SetHasFocusRing(true);
+  SetHasFocusIndicator(true);
 }
 
 void TreeView::OnBlur() {
   if (GetInputMethod())
     GetInputMethod()->DetachTextInputClient(GetPrefixSelector());
   SchedulePaintForNode(selected_node_);
   if (selector_)
     selector_->OnViewBlur();
-  SetHasFocusRing(false);
+  SetHasFocusIndicator(false);
 }
 
 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) {
   CommitEdit();
   RequestFocus();
 
   InternalNode* node = GetNodeAtPoint(event.location());
   if (!node)
     return true;
 
@@ skipping 139 matching lines @@
     return;
 
   gfx::Rect text_bounds(GetTextBoundsForNode(node));
   if (base::i18n::IsRTL())
     text_bounds.set_x(bounds.x());
 
   // Paint the background on the selected row.
   if (!PlatformStyle::kTreeViewSelectionPaintsEntireRow &&
       node == selected_node_) {
     canvas->FillRect(text_bounds, selected_row_bg_color);
-    if (HasFocus())
-      canvas->DrawFocusRect(text_bounds);
   }
 
   // Paint the text.
   const ui::NativeTheme::ColorId color_id =
       text_color_id(HasFocus(), node == selected_node_);
   const gfx::Rect internal_bounds(
       text_bounds.x() + kTextHorizontalPadding,
       text_bounds.y() + kTextVerticalPadding,
       text_bounds.width() - kTextHorizontalPadding * 2,
       text_bounds.height() - kTextVerticalPadding * 2);
@@ skipping 228 matching lines @@
 
   int arrow_dx = depth * kIndent + kHorizontalInset;
   gfx::Rect arrow_bounds(bounds().x() + arrow_dx,
                          row * row_height_ + kVerticalInset, kArrowRegionSize,
                          row_height_);
   if (base::i18n::IsRTL())
     arrow_bounds.set_x(bounds().width() - arrow_dx - kArrowRegionSize);
   return arrow_bounds.Contains(point);
 }
 
-void TreeView::SetHasFocusRing(bool shows) {
-  if (!ui::MaterialDesignController::IsSecondaryUiMaterial() ||
-      !PlatformStyle::kTreeViewHasFocusRing) {
-    return;
-  }
+void TreeView::SetHasFocusIndicator(bool shows) {
   // 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. 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);
+  // won't be scrolled.
+  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
+  if (scroll_view)
+    scroll_view->SetHasFocusIndicator(shows);
 }
 
 // InternalNode ----------------------------------------------------------------
 
 TreeView::InternalNode::InternalNode()
     : model_node_(NULL),
       loaded_children_(false),
       is_expanded_(false),
       text_width_(0) {
 }
@@ skipping 22 matching lines @@
   if (!is_expanded_)
     return max_width;
   for (int i = 0; i < child_count(); ++i) {
     max_width = std::max(max_width,
                          GetChild(i)->GetMaxWidth(indent, depth + 1));
   }
   return max_width;
 }
 
 }  // namespace views