Revert of Change focus indicator for TableView and TreeView.

ui/views/controls/table/table_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/table/table_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 528 matching lines @@
       text_background_color_id(HasFocus()));
   const SkColor fg_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TableText);
   const SkColor selected_fg_color = GetNativeTheme()->GetSystemColor(
       selected_text_color_id(HasFocus()));
   for (int i = region.min_row; i < region.max_row; ++i) {
     const int model_index = ViewToModel(i);
     const bool is_selected = selection_model_.IsSelected(model_index);
     if (is_selected)
       canvas->FillRect(GetRowBounds(i), selected_bg_color);
+    if (selection_model_.active() == model_index && HasFocus())
+      canvas->DrawFocusRect(GetRowBounds(i));
     for (int j = region.min_column; j < region.max_column; ++j) {
       const gfx::Rect cell_bounds(GetCellBounds(i, j));
       int text_x = kTextHorizontalPadding + cell_bounds.x();
 
       // Provide space for the grouping indicator, but draw it separately.
       if (j == 0 && grouper_)
         text_x += kGroupingIndicatorSize + kTextHorizontalPadding;
 
       // Always paint the icon in the first visible column.
       if (j == 0 && table_type_ == ICON_AND_TEXT) {
@@ skipping 57 matching lines @@
           kGroupingIndicatorSize / 2, grouping_flags);
     }
     canvas->DrawCircle(
         gfx::Point(group_indicator_x, start_cell_bounds.CenterPoint().y()),
         kGroupingIndicatorSize / 2, grouping_flags);
     i = last + 1;
   }
 }
 
 void TableView::OnFocus() {
-  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
-  if (scroll_view)
-    scroll_view->SetHasFocusIndicator(true);
   SchedulePaintForSelection();
-
   NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
 }
 
 void TableView::OnBlur() {
-  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
-  if (scroll_view)
-    scroll_view->SetHasFocusIndicator(false);
   SchedulePaintForSelection();
 }
 
 void TableView::NumRowsChanged() {
   SortItemsAndUpdateMapping();
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 void TableView::SortItemsAndUpdateMapping() {
@@ skipping 301 matching lines @@
   if (tooltip)
     *tooltip = text;
   if (tooltip_origin) {
     tooltip_origin->SetPoint(cell_bounds.x(),
                              cell_bounds.y() + kTextVerticalPadding);
   }
   return true;
 }
 
 }  // namespace views