Fix folder icon animation in app list.

ui/app_list/views/top_icon_animation_view.cc

 // Copyright 2014 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 "ui/app_list/views/top_icon_animation_view.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 31 matching lines @@
 
 void TopIconAnimationView::RemoveObserver(TopIconAnimationObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void TopIconAnimationView::TransformView() {
   // This view will delete itself on animation completion.
   set_owned_by_client();
 
   // Transform used for scaling down the icon and move it back inside to the
-  // original folder icon.
-  const float kIconTransformScale = 0.33333f;
+  // original folder icon. The transform's origin is this view's origin.
   gfx::Transform transform;
-  transform.Translate(scaled_rect_.x() - layer()->bounds().x(),
-                      scaled_rect_.y() - layer()->bounds().y());
-  transform.Scale(kIconTransformScale, kIconTransformScale);
+  transform.Translate(scaled_rect_.x() - bounds().x(),
+                      scaled_rect_.y() - bounds().y());
+  transform.Scale(
+      static_cast<double>(scaled_rect_.width()) / bounds().width(),
+      static_cast<double>(scaled_rect_.height()) / bounds().height());
 
   if (open_folder_) {
     // Transform to a scaled down icon inside the original folder icon.
     layer()->SetTransform(transform);
   }
 
   // Animate the icon to its target location and scale when opening or
   // closing a folder.
   ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
   settings.AddObserver(this);
@@ skipping 17 matching lines @@
                     observers_,
                     OnTopIconAnimationsComplete());
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 bool TopIconAnimationView::RequiresNotificationWhenAnimatorDestroyed() const {
   return true;
 }
 
 }  // namespace app_list