ash: Some code-cleanup around tray-resizing code.

ash/system/tray/tray_item_view.cc

 // Copyright (c) 2012 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 "ash/system/tray/tray_item_view.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 44 matching lines @@
   if (!set_visible) {
     animation_->Hide();
     AnimationProgressed(animation_.get());
   } else {
     animation_->Show();
     AnimationProgressed(animation_.get());
     views::View::SetVisible(true);
   }
 }
 
-void TrayItemView::ApplyChange() {
-  // Forcing the widget to the new size is sufficient. The positioning is
-  // taken care of by the layout manager (ShelfLayoutManager).
-  GetWidget()->SetSize(GetWidget()->GetContentsView()->GetPreferredSize());
-}
-
 gfx::Size TrayItemView::DesiredSize() {
   return views::View::GetPreferredSize();
 }
 
 int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
-void TrayItemView::PreferredSizeChanged() {
-  views::View::PreferredSizeChanged();
-  ApplyChange();
-}
-
 gfx::Size TrayItemView::GetPreferredSize() {
   gfx::Size size = DesiredSize();
   size.set_height(kTrayIconHeight);
   if (!animation_.get() || !animation_->is_animating())
     return size;
   size.set_width(std::max(1,
       static_cast<int>(size.width() * animation_->GetCurrentValue())));
   return size;
 }
 
+void TrayItemView::ChildPreferredSizeChanged(views::View* child) {
+  PreferredSizeChanged();
+}
+
 void TrayItemView::AnimationProgressed(const ui::Animation* animation) {
   ui::Transform transform;
   transform.SetScale(animation->GetCurrentValue(),
                      animation->GetCurrentValue());
   transform.ConcatTranslate(0, animation->CurrentValueBetween(
       static_cast<double>(height()) / 2, 0.));
   layer()->SetTransform(transform);
-  ApplyChange();
+  PreferredSizeChanged();
 }
 
 void TrayItemView::AnimationEnded(const ui::Animation* animation) {
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
   AnimationEnded(animation);
 }
 
 }  // namespace internal
 }  // namespace ash