ash: Animate changes in the uber tray.

ash/system/tray/tray_image_item.cc

Index: ash/system/tray/tray_image_item.cc
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
index 4ceff22db09d2fc354ecad853714c43b95de6068..9e92e0c8a6cb97db5b8cb21b3d428cd979084e1b 100644
--- a/ash/system/tray/tray_image_item.cc
+++ b/ash/system/tray/tray_image_item.cc
@@ -4,9 +4,11 @@
 
 #include "ash/system/tray/tray_image_item.h"
 
+#include "ash/system/tray/tray_item_view.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 namespace internal {
@@ -17,12 +19,17 @@ TrayImageItem::TrayImageItem(int resource_id)
 
 TrayImageItem::~TrayImageItem() {}
 
+views::View* TrayImageItem::tray_view() {
+  return tray_view_.get();
+}
+
 views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
-  image_view_.reset(new views::ImageView);
-  image_view_->SetImage(ui::ResourceBundle::GetSharedInstance().
+  tray_view_.reset(new TrayItemView);
+  tray_view_->CreateImageView();
+  tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
       GetImageNamed(resource_id_).ToSkBitmap());
-  image_view_->SetVisible(GetInitialVisibility());
-  return image_view_.get();
+  tray_view_->SetVisible(GetInitialVisibility());
+  return tray_view_.get();
 }
 
 views::View* TrayImageItem::CreateDefaultView(user::LoginStatus status) {
@@ -34,7 +41,7 @@ views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) {
 }
 
 void TrayImageItem::DestroyTrayView() {
-  image_view_.reset();
+  tray_view_.reset();
 }
 
 void TrayImageItem::DestroyDefaultView() {