Rework tree APIs to reflect Google style and more const-correctness....

views/controls/scroll_view.cc

 // Copyright (c) 2010 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/scroll_view.h"
 
 #include "base/logging.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/root_view.h"
 
 namespace views {
 
 const char* const ScrollView::kViewClassName = "views/ScrollView";
 
 // Viewport contains the contents View of the ScrollView.
 class Viewport : public View {
  public:
   Viewport() {}
   virtual ~Viewport() {}
 
   virtual void ScrollRectToVisible(const gfx::Rect& rect) {
-    if (!GetChildViewCount() || !GetParent())
+    if (!has_children() || !parent())
       return;
 
     View* contents = GetChildViewAt(0);
     gfx::Rect scroll_rect(rect);
     scroll_rect.Offset(-contents->x(), -contents->y());
-    static_cast<ScrollView*>(GetParent())->ScrollContentsRegionToBeVisible(
+    static_cast<ScrollView*>(parent())->ScrollContentsRegionToBeVisible(
         scroll_rect);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Viewport);
 };
 
 
 ScrollView::ScrollView() {
   Init(new NativeScrollBar(true), new NativeScrollBar(false), NULL);
 }
 
 ScrollView::ScrollView(ScrollBar* horizontal_scrollbar,
                        ScrollBar* vertical_scrollbar,
                        View* resize_corner) {
   Init(horizontal_scrollbar, vertical_scrollbar, resize_corner);
 }
 
 ScrollView::~ScrollView() {
   // If scrollbars are currently not used, delete them
-  if (!horiz_sb_->GetParent()) {
+  if (!horiz_sb_->parent())
     delete horiz_sb_;
-  }
 
-  if (!vert_sb_->GetParent()) {
+  if (!vert_sb_->parent())
     delete vert_sb_;
-  }
 
-  if (resize_corner_ && !resize_corner_->GetParent()) {
+  if (resize_corner_ && !resize_corner_->parent())
     delete resize_corner_;
-  }
 }
 
 void ScrollView::SetContents(View* a_view) {
   if (contents_ && contents_ != a_view) {
     viewport_->RemoveChildView(contents_);
     delete contents_;
     contents_ = NULL;
   }
 
   if (a_view) {
@@ skipping 372 matching lines @@
 
 VariableRowHeightScrollHelper::~VariableRowHeightScrollHelper() {
 }
 
 int VariableRowHeightScrollHelper::GetPageScrollIncrement(
     ScrollView* scroll_view, bool is_horizontal, bool is_positive) {
   if (is_horizontal)
     return 0;
   // y coordinate is most likely negative.
   int y = abs(scroll_view->GetContents()->y());
-  int vis_height = scroll_view->GetContents()->GetParent()->height();
+  int vis_height = scroll_view->GetContents()->parent()->height();
   if (is_positive) {
     // Align the bottom most row to the top of the view.
     int bottom = std::min(scroll_view->GetContents()->height() - 1,
                           y + vis_height);
     RowInfo bottom_row_info = GetRowInfo(bottom);
     // If 0, ScrollView will provide a default value.
     return std::max(0, bottom_row_info.origin - y);
   } else {
     // Align the row on the previous page to to the top of the view.
     int last_page_y = y - vis_height;
@@ skipping 38 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views