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

chrome/browser/ui/views/infobars/infobar_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/infobars/infobar_view.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/browser/ui/views/infobars/infobar_container.h"
@@ skipping 76 matching lines @@
   if (GetWidget() &&
       !ui::DoesWindowBelongToActiveWindow(GetWidget()->GetNativeView())) {
     restore_focus = false;
   }
 #endif  // defined(OS_WIN)
   DestroyFocusTracker(restore_focus);
   animation_->Hide();
 }
 
 void InfoBarView::Close() {
-  GetParent()->RemoveChildView(this);
+  parent()->RemoveChildView(this);
   // Note that we only tell the delegate we're closed here, and not when we're
   // simply destroyed (by virtue of a tab switch or being moved from window to
   // window), since this action can cause the delegate to destroy itself.
   if (delegate_) {
     delegate_->InfoBarClosed();
     delegate_ = NULL;
   }
 }
 
 void InfoBarView::PaintArrow(gfx::Canvas* canvas,
                              views::View* outer_view,
                              int arrow_center_x) {
   gfx::Point infobar_top(0, y());
-  ConvertPointToView(GetParent(), outer_view, &infobar_top);
+  ConvertPointToView(parent(), outer_view, &infobar_top);
   int infobar_top_y = infobar_top.y();
 
   // The size of the arrow (its height; also half its width).  The
   // arrow area is |arrow_size| ^ 2.  By taking the square root of the
   // animation value, we cause a linear animation of the area, which
   // matches the perception of the animation of the InfoBar.
   const int kArrowSize = 10;
   int arrow_size = static_cast<int>(kArrowSize *
                                     sqrt(animation_->GetCurrentValue()));
 
@@ skipping 74 matching lines @@
       // since no-one refers to us now.
       MessageLoop::current()->PostTask(FROM_HERE,
           delete_factory_.NewRunnableMethod(&InfoBarView::DeleteSelf));
       if (GetFocusManager())
         GetFocusManager()->RemoveFocusChangeListener(this);
     }
   }
 
   // For accessibility, ensure the close button is the last child view.
   if ((parent == this) && (child != close_button_) &&
-      HasChildView(close_button_) &&
-      (GetChildViewAt(GetChildViewCount() - 1) != close_button_)) {
+      (close_button_->parent() == this) &&
+      (GetChildViewAt(child_count() - 1) != close_button_)) {
     RemoveChildView(close_button_);
     AddChildView(close_button_);
   }
 }
 
 void InfoBarView::ButtonPressed(views::Button* sender,
                                 const views::Event& event) {
   if (sender == close_button_) {
     if (delegate_)
       delegate_->InfoBarDismissed();
@@ skipping 28 matching lines @@
 }
 
 gfx::Size InfoBarView::GetPreferredSize() {
   int height = static_cast<int>(target_height_ * animation_->GetCurrentValue());
   return gfx::Size(0, height);
 }
 
 void InfoBarView::FocusWillChange(View* focused_before, View* focused_now) {
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
-  if (focused_before && focused_now && !this->IsParentOf(focused_before) &&
-      this->IsParentOf(focused_now))
+  if (focused_before && focused_now && !this->Contains(focused_before) &&
+      this->Contains(focused_now))
     NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
 }
 
 void InfoBarView::AnimationEnded(const ui::Animation* animation) {
   if (container_) {
     container_->InfoBarAnimated(false);
 
     if (!animation_->IsShowing())
       Close();
   }
 }
 
 void InfoBarView::DestroyFocusTracker(bool restore_focus) {
   if (focus_tracker_ != NULL) {
     if (restore_focus)
       focus_tracker_->FocusLastFocusedExternalView();
     focus_tracker_->SetFocusManager(NULL);
     focus_tracker_.reset();
   }
 }
 
 void InfoBarView::DeleteSelf() {
   delete this;
 }