Rename GetPreferredSize to CalculatePreferredSize in ash/

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 "ash/public/cpp/shelf_types.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 65 matching lines @@
     animation_->Show();
     AnimationProgressed(animation_.get());
     views::View::SetVisible(true);
   }
 }
 
 int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
-gfx::Size TrayItemView::GetPreferredSize() const {
+gfx::Size TrayItemView::CalculatePreferredSize() const {
   DCHECK_EQ(1, child_count());
   gfx::Size inner_size = views::View::GetPreferredSize();
   if (image_view_)
     inner_size = gfx::Size(kTrayIconSize, kTrayIconSize);
   gfx::Rect rect(inner_size);
   rect.Inset(gfx::Insets(-kTrayImageItemPadding));
   gfx::Size size = rect.size();
   if (!animation_.get() || !animation_->is_animating())
     return size;
   if (owner()->system_tray()->shelf()->IsHorizontalAlignment()) {
@@ skipping 32 matching lines @@
 void TrayItemView::AnimationEnded(const gfx::Animation* animation) {
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 }  // namespace ash