ash: Animate changes in the uber tray.

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 156 matching lines @@
   views::View* update_;
 
   TrayPopupTextButton* shutdown_;
   TrayPopupTextButton* signout_;
   TrayPopupTextButton* lock_;
 
   DISALLOW_COPY_AND_ASSIGN(UserView);
 };
 
 // A custom image view with rounded edges.
-class RoundedImageView : public views::View {
+class RoundedImageView : public TrayItemView {
  public:
   // Constructs a new rounded image view with rounded corners of radius
   // |corner_radius|.
   explicit RoundedImageView(int corner_radius) : corner_radius_(corner_radius) {
   }
 
   virtual ~RoundedImageView() {
   }
 
   // Set the bitmap that should be displayed from a pointer. The pointer
   // contents is copied in the receiver's bitmap.
   void SetImage(const SkBitmap& bm, const gfx::Size& size) {
     image_ = bm;
     image_size_ = size;
 
     // Try to get the best image quality for the avatar.
     resized_ = skia::ImageOperations::Resize(image_,
         skia::ImageOperations::RESIZE_BEST, size.width(), size.height());
-    PreferredSizeChanged();
-    SchedulePaint();
+    if (GetWidget() && visible()) {
+      PreferredSizeChanged();
+      SchedulePaint();
+    }
   }
 
-  // Overridden from views::View.
-  virtual gfx::Size GetPreferredSize() OVERRIDE {
+  // Overridden from TrayItemView.
+  virtual gfx::Size DesiredSize() OVERRIDE {
     return gfx::Size(image_size_.width() + GetInsets().width(),
                      image_size_.height() + GetInsets().height());
   }
 
+  virtual int GetAnimationDurationMS() OVERRIDE {
+    return 750;
+  }
+
+  // Overridden from views::View.
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     View::OnPaint(canvas);
-    gfx::Rect image_bounds(GetPreferredSize());
+    gfx::Rect image_bounds(DesiredSize());
     image_bounds.Inset(GetInsets());
     const SkScalar kRadius = SkIntToScalar(corner_radius_);
     SkPath path;
     path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius, kRadius);
 
     SkPaint paint;
     SkShader* shader = SkShader::CreateBitmapShader(resized_,
                                                     SkShader::kRepeat_TileMode,
                                                     SkShader::kRepeat_TileMode);
     SkMatrix shader_matrix;
@@ skipping 62 matching lines @@
 }
 
 void TrayUser::OnUserUpdate() {
   avatar_->SetImage(
       ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
       gfx::Size(kUserIconSize, kUserIconSize));
 }
 
 }  // namespace internal
 }  // namespace ash