Revert of Change focus indicator for TableView and TreeView.

ui/views/controls/scroll_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_SCROLL_VIEW_H_
 #define UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 28 matching lines @@
  public:
   static const char kViewClassName[];
 
   ScrollView();
 
   ~ScrollView() override;
 
   // Creates a ScrollView with a theme specific border.
   static ScrollView* CreateScrollViewWithBorder();
 
-  // Returns the ScrollView for which |contents| is its contents, or null if
-  // |contents| is not in a ScrollView.
-  static ScrollView* GetScrollViewForContents(View* contents);
-
   // Set the contents. Any previous contents will be deleted. The contents
   // is the view that needs to scroll.
   void SetContents(View* a_view);
   const View* contents() const { return contents_; }
   View* contents() { return contents_; }
 
   // Sets the header, deleting the previous header.
   void SetHeader(View* header);
 
   // Sets the background color. The default is white when scrolling with layers,
@@ skipping 22 matching lines @@
 
   // Returns the horizontal/vertical scrollbar. This may return NULL.
   const ScrollBar* horizontal_scroll_bar() const { return horiz_sb_; }
   const ScrollBar* vertical_scroll_bar() const { return vert_sb_; }
 
   // Customize the scrollbar design. ScrollView takes the ownership of the
   // specified ScrollBar. |horiz_sb| and |vert_sb| cannot be NULL.
   void SetHorizontalScrollBar(ScrollBar* horiz_sb);
   void SetVerticalScrollBar(ScrollBar* vert_sb);
 
-  // Sets whether this ScrollView has a focus indicator or not.
-  void SetHasFocusIndicator(bool has_focus_indicator);
+  // Sets whether this ScrollView has a focus ring or not.
+  void SetHasFocusRing(bool has_focus_ring);
 
   // View overrides:
   gfx::Size GetPreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   void Layout() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   const char* GetClassName() const override;
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // ScrollBarController overrides:
   void ScrollToPosition(ScrollBar* source, int position) override;
   int GetScrollIncrement(ScrollBar* source,
                          bool is_page,
                          bool is_positive) override;
 
   // TODO(djacobo): Remove this method when http://crbug.com/656198  is closed.
   // Force |contents_viewport_| to enable a Layer().
   void EnableViewPortLayer();
@@ skipping 34 matching lines @@
 
   // Whether the ScrollView scrolls using ui::Layer APIs.
   bool ScrollsWithLayers() const;
 
   // Callback entrypoint when hosted Layers are scrolled by the Compositor.
   void OnLayerScrolled(const gfx::ScrollOffset& offset);
 
   // Horizontally scrolls the header (if any) to match the contents.
   void ScrollHeader();
 
-  void AddBorder();
-  void UpdateBorder();
-
   // The current contents and its viewport. |contents_| is contained in
   // |contents_viewport_|.
   View* contents_;
   View* contents_viewport_;
 
   // The current header and its viewport. |header_| is contained in
   // |header_viewport_|.
   View* header_;
   View* header_viewport_;
 
@@ skipping 12 matching lines @@
   int max_height_;
 
   // The background color given to the viewport (for overscroll), and to the
   // contents when scrolling with layers.
   SkColor background_color_;
 
   // If true, never show the horizontal scrollbar (even if the contents is wider
   // than the viewport).
   bool hide_horizontal_scrollbar_;
 
-  // In Harmony, the indicator is a focus ring. Pre-Harmony, the indicator is a
-  // different border painter.
-  bool draw_focus_indicator_ = false;
-
-  // Only needed for pre-Harmony. Remove when Harmony is default.
-  bool draw_border_ = false;
-
   // Focus ring, if one is installed.
   View* focus_ring_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollView);
 };
 
 // VariableRowHeightScrollHelper is intended for views that contain rows of
 // varying height. To use a VariableRowHeightScrollHelper create one supplying
 // a Controller and delegate GetPageScrollIncrement and GetLineScrollIncrement
 // to the helper. VariableRowHeightScrollHelper calls back to the
@@ skipping 59 matching lines @@
  private:
   int top_margin_;
   int row_height_;
 
   DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_