Convert some more view methods to the ui/views style.

views/controls/single_split_view.cc

 // Copyright (c) 2011 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 "views/controls/single_split_view.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ skipping 31 matching lines @@
           skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
 #endif
 }
 
 void SingleSplitView::Layout() {
   gfx::Rect leading_bounds;
   gfx::Rect trailing_bounds;
   CalculateChildrenBounds(bounds(), &leading_bounds, &trailing_bounds);
 
   if (has_children()) {
-    if (GetChildViewAt(0)->IsVisible())
-      GetChildViewAt(0)->SetBoundsRect(leading_bounds);
+    if (child_at(0)->IsVisible())
+      child_at(0)->SetBoundsRect(leading_bounds);
     if (child_count() > 1) {
-      if (GetChildViewAt(1)->IsVisible())
-        GetChildViewAt(1)->SetBoundsRect(trailing_bounds);
+      if (child_at(1)->IsVisible())
+        child_at(1)->SetBoundsRect(trailing_bounds);
     }
   }
 
   SchedulePaint();
 
   // Invoke super's implementation so that the children are layed out.
   View::Layout();
 }
 
 std::string SingleSplitView::GetClassName() const {
   return kViewClassName;
 }
 
 void SingleSplitView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
   state->name = accessible_name_;
 }
 
 gfx::Size SingleSplitView::GetPreferredSize() {
   int width = 0;
   int height = 0;
   for (int i = 0; i < 2 && i < child_count(); ++i) {
-    View* view = GetChildViewAt(i);
+    View* view = child_at(i);
     gfx::Size pref = view->GetPreferredSize();
     if (is_horizontal_) {
       width += pref.width();
       height = std::max(height, pref.height());
     } else {
       width = std::max(width, pref.width());
       height += pref.height();
     }
   }
   if (is_horizontal_)
@@ skipping 13 matching lines @@
 #elif defined(OS_LINUX)
   return gfx::GetCursor(is_horizontal_ ? GDK_SB_H_DOUBLE_ARROW :
                                          GDK_SB_V_DOUBLE_ARROW);
 #endif
 }
 
 void SingleSplitView::CalculateChildrenBounds(
     const gfx::Rect& bounds,
     gfx::Rect* leading_bounds,
     gfx::Rect* trailing_bounds) const {
-  bool is_leading_visible = has_children() && GetChildViewAt(0)->IsVisible();
-  bool is_trailing_visible =
-      child_count() > 1 && GetChildViewAt(1)->IsVisible();
+  bool is_leading_visible = has_children() && child_at(0)->IsVisible();
+  bool is_trailing_visible = child_count() > 1 && child_at(1)->IsVisible();
 
   if (!is_leading_visible && !is_trailing_visible) {
     *leading_bounds = gfx::Rect();
     *trailing_bounds = gfx::Rect();
     return;
   }
 
   int divider_at;
 
   if (!is_trailing_visible) {
@@ skipping 38 matching lines @@
 
 bool SingleSplitView::OnMouseDragged(const MouseEvent& event) {
   if (child_count() < 2)
     return false;
 
   int delta_offset = GetPrimaryAxisSize(event.x(), event.y()) -
       drag_info_.initial_mouse_offset;
   if (is_horizontal_ && base::i18n::IsRTL())
     delta_offset *= -1;
   // Honor the minimum size when resizing.
-  gfx::Size min = GetChildViewAt(0)->GetMinimumSize();
+  gfx::Size min = child_at(0)->GetMinimumSize();
   int new_size = std::max(GetPrimaryAxisSize(min.width(), min.height()),
                           drag_info_.initial_divider_offset + delta_offset);
 
   // And don't let the view get bigger than our width.
   new_size = std::min(GetPrimaryAxisSize() - kDividerSize, new_size);
 
   if (new_size != divider_offset_) {
     set_divider_offset(new_size);
     if (!observer_ || observer_->SplitHandleMoved(this))
       Layout();
@@ skipping 14 matching lines @@
 
 void SingleSplitView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   divider_offset_ = CalculateDividerOffset(divider_offset_, previous_bounds,
                                            bounds());
 }
 
 bool SingleSplitView::IsPointInDivider(const gfx::Point& p) {
   if (child_count() < 2)
     return false;
 
-  if (!GetChildViewAt(0)->IsVisible() || !GetChildViewAt(1)->IsVisible())
+  if (!child_at(0)->IsVisible() || !child_at(1)->IsVisible())
     return false;
 
   int divider_relative_offset;
   if (is_horizontal_) {
     divider_relative_offset =
-        p.x() - GetChildViewAt(base::i18n::IsRTL() ? 1 : 0)->width();
+        p.x() - child_at(base::i18n::IsRTL() ? 1 : 0)->width();
   } else {
-    divider_relative_offset = p.y() - GetChildViewAt(0)->height();
+    divider_relative_offset = p.y() - child_at(0)->height();
   }
   return (divider_relative_offset >= 0 &&
       divider_relative_offset < kDividerSize);
 }
 
 int SingleSplitView::CalculateDividerOffset(
     int divider_offset,
     const gfx::Rect& previous_bounds,
     const gfx::Rect& new_bounds) const {
   if (resize_leading_on_bounds_change_ && divider_offset != -1) {
@@ skipping 18 matching lines @@
 int SingleSplitView::NormalizeDividerOffset(int divider_offset,
                                             const gfx::Rect& bounds) const {
   int primary_axis_size = GetPrimaryAxisSize(bounds.width(), bounds.height());
   if (divider_offset < 0)
     return (primary_axis_size - kDividerSize) / 2;
   return std::min(divider_offset,
                   std::max(primary_axis_size - kDividerSize, 0));
 }
 
 }  // namespace views