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

views/window/non_client_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/window/non_client_view.h"
 
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
@@ skipping 26 matching lines @@
   // so we need to manually remove it.
   RemoveChildView(frame_view_.get());
 }
 
 void NonClientView::SetFrameView(NonClientFrameView* frame_view) {
   // See comment in header about ownership.
   frame_view->set_parent_owned(false);
   if (frame_view_.get())
     RemoveChildView(frame_view_.get());
   frame_view_.reset(frame_view);
-  if (GetParent())
-    AddChildView(kFrameViewIndex, frame_view_.get());
+  if (parent())
+    AddChildViewAt(frame_view_.get(), kFrameViewIndex);
 }
 
 bool NonClientView::CanClose() const {
   return client_view_->CanClose();
 }
 
 void NonClientView::WindowClosing() {
   client_view_->WindowClosing();
 }
 
@@ skipping 87 matching lines @@
   // reason as above.
   client_view_->Layout();
 }
 
 void NonClientView::ViewHierarchyChanged(bool is_add, View* parent,
                                          View* child) {
   // Add our two child views here as we are added to the Widget so that if we
   // are subsequently resized all the parent-child relationships are
   // established.
   if (is_add && GetWidget() && child == this) {
-    AddChildView(kFrameViewIndex, frame_view_.get());
-    AddChildView(kClientViewIndex, client_view_);
+    AddChildViewAt(frame_view_.get(), kFrameViewIndex);
+    AddChildViewAt(client_view_, kClientViewIndex);
   }
 }
 
 views::View* NonClientView::GetViewForPoint(const gfx::Point& point) {
   // Because of the z-ordering of our child views (the client view is positioned
   // over the non-client frame view, if the client view ever overlaps the frame
   // view visually (as it does for the browser window), then it will eat mouse
   // events for the window controls. We override this method here so that we can
   // detect this condition and re-route the events to the non-client frame view.
   // The assumption is that the frame view's implementation of HitTest will only
@@ skipping 78 matching lines @@
 
 bool NonClientFrameView::ShouldPaintAsActive() const {
   return GetWindow()->IsActive() || paint_as_active_;
 }
 
 AccessibilityTypes::Role NonClientFrameView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_WINDOW;
 }
 
 }  // namespace views