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

chrome/browser/ui/views/frame/browser_view_layout.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 "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 528 matching lines @@
       contents_split_bounds, &sidebar_split_bounds, &devtools_bounds);
   gfx::Point contents_split_offset(
       contents_split_bounds.x() - contents_split_->bounds().x(),
       contents_split_bounds.y() - contents_split_->bounds().y());
   gfx::Point sidebar_split_offset(contents_split_offset);
   sidebar_split_offset.Offset(sidebar_split_bounds.x(),
                               sidebar_split_bounds.y());
 
   views::SingleSplitView* sidebar_split = browser_view_->sidebar_split_;
   if (sidebar_split) {
-    DCHECK(sidebar_split == contents_split_->GetChildViewAt(0));
+    DCHECK(sidebar_split == contents_split_->child_at(0));
     sidebar_split->CalculateChildrenBounds(
         sidebar_split_bounds, &contents_bounds, &sidebar_bounds);
   } else {
     contents_bounds = sidebar_split_bounds;
   }
 
   // Layout resize corner, sidebar mini tabs and calculate reserved contents
   // rects here as all contents view bounds are already determined, but not yet
   // set at this point, so contents will be laid out once at most.
   // TODO(alekseys): layout sidebar minitabs and adjust reserved rect
@@ skipping 32 matching lines @@
   if (sidebar_split)
     sidebar_split->SetBoundsRect(sidebar_split_bounds);
 }
 
 int BrowserViewLayout::GetTopMarginForActiveContent() {
   if (!active_bookmark_bar_ || !browser_view_->IsBookmarkBarVisible() ||
       !active_bookmark_bar_->IsDetached()) {
     return 0;
   }
 
-  if (contents_split_->GetChildViewAt(1) &&
-      contents_split_->GetChildViewAt(1)->IsVisible())
+  if (contents_split_->child_at(1) &&
+      contents_split_->child_at(1)->IsVisible())
     return 0;
 
   if (SidebarManager::IsSidebarAllowed()) {
-    views::View* sidebar_split = contents_split_->GetChildViewAt(0);
-    if (sidebar_split->GetChildViewAt(1) &&
-        sidebar_split->GetChildViewAt(1)->IsVisible())
+    views::View* sidebar_split = contents_split_->child_at(0);
+    if (sidebar_split->child_count() >= 2 &&
+        sidebar_split->child_at(1)->IsVisible())
       return 0;
   }
 
   // Adjust for separator.
   return active_bookmark_bar_->height() -
       views::NonClientFrameView::kClientEdgeThickness;
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
 #if !defined(OS_CHROMEOS)
@@ skipping 14 matching lines @@
   }
 #endif
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }