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

chrome/browser/chromeos/notifications/notification_panel.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.
 
 // Draws the view for the balloons.
 
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 
 #include <algorithm>
 
@@ skipping 152 matching lines @@
   virtual ~BalloonSubContainer() {}
 
   // views::View overrides.
   virtual gfx::Size GetPreferredSize() {
     return preferred_size_;
   }
 
   virtual void Layout() {
     // Layout bottom up
     int height = 0;
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       views::View* child = GetChildViewAt(i);
       child->SetBounds(0, height, child->width(), child->height());
       height += child->height() + margin_;
     }
     SchedulePaint();
   }
 
   // Updates the bound so that it can show all balloons.
   void UpdateBounds() {
     int height = 0;
     int max_width = 0;
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       views::View* child = GetChildViewAt(i);
       height += child->height() + margin_;
       max_width = std::max(max_width, child->width());
     }
     if (height > 0)
       height -= margin_;
     preferred_size_.set_width(max_width);
     preferred_size_.set_height(height);
     SizeToPreferredSize();
   }
 
   // Returns the bounds that covers new notifications.
   gfx::Rect GetNewBounds() {
     gfx::Rect rect;
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       BalloonViewImpl* view =
           static_cast<BalloonViewImpl*>(GetChildViewAt(i));
       if (!view->stale()) {
         if (rect.IsEmpty()) {
           rect = view->bounds();
         } else {
           rect = rect.Union(view->bounds());
         }
       }
     }
     return gfx::Rect(x(), y(), rect.width(), rect.height());
   }
 
   // Returns # of new notifications.
   int GetNewCount() {
     int count = 0;
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       BalloonViewImpl* view =
           static_cast<BalloonViewImpl*>(GetChildViewAt(i));
       if (!view->stale())
         count++;
     }
     return count;
   }
 
   // Make all notifications stale.
   void MakeAllStale() {
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       BalloonViewImpl* view =
           static_cast<BalloonViewImpl*>(GetChildViewAt(i));
       view->set_stale();
     }
   }
 
   void DismissAll() {
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       BalloonViewImpl* view =
           static_cast<BalloonViewImpl*>(GetChildViewAt(i));
       view->Close(true);
     }
   }
 
   BalloonViewImpl* FindBalloonView(const Notification& notification) {
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       BalloonViewImpl* view =
           static_cast<BalloonViewImpl*>(GetChildViewAt(i));
       if (view->IsFor(notification)) {
         return view;
       }
     }
     return NULL;
   }
 
   BalloonViewImpl* FindBalloonView(const gfx::Point point) {
     gfx::Point copy(point);
     ConvertPointFromWidget(this, &copy);
-    for (int i = GetChildViewCount() - 1; i >= 0; --i) {
+    for (int i = child_count() - 1; i >= 0; --i) {
       views::View* view = GetChildViewAt(i);
       if (view->bounds().Contains(copy))
         return static_cast<BalloonViewImpl*>(view);
     }
     return NULL;
   }
 
  private:
   gfx::Size preferred_size_;
   int margin_;
@@ skipping 12 matching lines @@
         sticky_container_(new BalloonSubContainer(margin)),
         non_sticky_container_(new BalloonSubContainer(margin)) {
     AddChildView(sticky_container_);
     AddChildView(non_sticky_container_);
   }
   virtual ~BalloonContainer() {}
 
   // views::View overrides.
   virtual void Layout() {
     int margin =
-        (sticky_container_->GetChildViewCount() != 0 &&
-         non_sticky_container_->GetChildViewCount() != 0) ?
+        (sticky_container_->child_count() != 0 &&
+         non_sticky_container_->child_count() != 0) ?
         margin_ : 0;
     sticky_container_->SetBounds(
         0, 0, width(), sticky_container_->height());
     non_sticky_container_->SetBounds(
         0, sticky_container_->bounds().bottom() + margin,
         width(), non_sticky_container_->height());
   }
 
   virtual gfx::Size GetPreferredSize() {
     return preferred_size_;
@@ skipping 13 matching lines @@
   // Adds a ballon to the panel.
   void Add(Balloon* balloon) {
     BalloonViewImpl* view = GetBalloonViewOf(balloon);
     GetContainerFor(balloon)->AddChildView(view);
   }
 
   // Updates the position of the |balloon|.
   bool Update(Balloon* balloon) {
     BalloonViewImpl* view = GetBalloonViewOf(balloon);
     View* container = NULL;
-    if (sticky_container_->HasChildView(view)) {
+    if (view->parent() == sticky_container_) {
       container = sticky_container_;
-    } else if (non_sticky_container_->HasChildView(view)) {
+    } else if (view->parent() == non_sticky_container_) {
       container = non_sticky_container_;
     }
     if (container) {
       container->RemoveChildView(view);
       container->AddChildView(view);
       return true;
     } else {
       return false;
     }
   }
 
   // Removes a ballon from the panel.
   BalloonViewImpl* Remove(Balloon* balloon) {
     BalloonViewImpl* view = GetBalloonViewOf(balloon);
     GetContainerFor(balloon)->RemoveChildView(view);
     return view;
   }
 
   // Returns the number of notifications added to the panel.
   int GetNotificationCount() {
-    return sticky_container_->GetChildViewCount() +
-        non_sticky_container_->GetChildViewCount();
+    return sticky_container_->child_count() +
+        non_sticky_container_->child_count();
   }
 
   // Returns the # of new notifications.
   int GetNewNotificationCount() {
     return sticky_container_->GetNewCount() +
         non_sticky_container_->GetNewCount();
   }
 
   // Returns the # of sticky and new notifications.
   int GetStickyNewNotificationCount() {
-    return sticky_container_->GetChildViewCount() +
+    return sticky_container_->child_count() +
         non_sticky_container_->GetNewCount();
   }
 
   // Returns the # of sticky notifications.
   int GetStickyNotificationCount() {
-    return sticky_container_->GetChildViewCount();
+    return sticky_container_->child_count();
   }
 
   // Returns true if the |view| is contained in the panel.
   bool HasBalloonView(View* view) {
-    return sticky_container_->HasChildView(view) ||
-        non_sticky_container_->HasChildView(view);
+    return view->parent() == sticky_container_ ||
+        view->parent() == non_sticky_container_;
   }
 
   // Updates the bounds so that all notifications are visible.
   void UpdateBounds() {
     sticky_container_->UpdateBounds();
     non_sticky_container_->UpdateBounds();
     preferred_size_ = sticky_container_->GetPreferredSize();
 
     gfx::Size non_sticky_size = non_sticky_container_->GetPreferredSize();
     int margin =
@@ skipping 485 matching lines @@
                                   &origin);
   return rect.Contains(gfx::Rect(origin, view->size()));
 }
 
 
 bool NotificationPanelTester::IsActive(const BalloonViewImpl* view) const {
   return panel_->active_ == view;
 }
 
 }  // namespace chromeos