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

chrome/browser/ui/views/options/cookies_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 "chrome/browser/ui/views/options/cookies_view.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 55 matching lines @@
 // CookiesView::InfoPanelView
 //  Overridden to handle layout of the various info views.
 //
 // This view is a child of the CookiesView and participates
 // in its GridLayout. The various info views are all children
 // of this view. Only one child is expected to be visible at a time.
 
 class CookiesView::InfoPanelView : public views::View {
  public:
   virtual void Layout() {
-    int child_count = GetChildViewCount();
-    for (int i = 0; i < child_count; ++i)
+    for (int i = 0; i < child_count(); ++i)
       GetChildViewAt(i)->SetBounds(0, 0, width(), height());
   }
 
   virtual gfx::Size GetPreferredSize() {
-    DCHECK(GetChildViewCount() > 0);
+    DCHECK(has_children());
     return GetChildViewAt(0)->GetPreferredSize();
   }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, public:
 
 // static
 void CookiesView::ShowCookiesWindow(Profile* profile) {
   if (!instance_) {
@@ skipping 77 matching lines @@
 views::View* CookiesView::GetContentsView() {
   return this;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, views::View overrides:
 
 void CookiesView::Layout() {
   // Lay out the Remove/Remove All buttons in the parent view.
   gfx::Size ps = remove_button_->GetPreferredSize();
-  gfx::Rect parent_bounds = GetParent()->GetContentsBounds();
+  gfx::Rect parent_bounds = parent()->GetContentsBounds();
   int y_buttons =
       parent_bounds.bottom() - ps.height() - views::kButtonVEdgeMargin;
 
   remove_button_->SetBounds(kPanelHorizMargin, y_buttons, ps.width(),
                             ps.height());
 
   ps = remove_all_button_->GetPreferredSize();
   int remove_all_x = remove_button_->x() + remove_button_->width() +
       kRelatedControlHorizontalSpacing;
   remove_all_button_->SetBounds(remove_all_x, y_buttons, ps.width(),
@@ skipping 164 matching lines @@
   cookies_tree_->set_auto_expand_children(true);
   layout->AddView(cookies_tree_);
 
   cookies_tree_->SetController(this);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(info_panel_);
 
   // Add the Remove/Remove All buttons to the ClientView
-  View* parent = GetParent();
-  parent->AddChildView(remove_button_);
-  parent->AddChildView(remove_all_button_);
+  parent()->AddChildView(remove_button_);
+  parent()->AddChildView(remove_all_button_);
   if (!cookies_tree_model_.get()->GetRoot()->GetChildCount()) {
     UpdateForEmptyState();
   } else {
     UpdateVisibleDetailedInfo(cookie_info_view_);
     UpdateRemoveButtonsState();
   }
 }
 
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(std::wstring());
@@ skipping 15 matching lines @@
       GetTotalNodeCount() > 1);
 }
 
 void CookiesView::UpdateVisibleDetailedInfo(views::View* view) {
   cookie_info_view_->SetVisible(view == cookie_info_view_);
   database_info_view_->SetVisible(view == database_info_view_);
   local_storage_info_view_->SetVisible(view == local_storage_info_view_);
   appcache_info_view_->SetVisible(view == appcache_info_view_);
   indexed_db_info_view_->SetVisible(view == indexed_db_info_view_);
 }