ash: Animate changes in the uber tray.

ash/system/network/tray_network.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/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.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 "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
@@ skipping 68 matching lines @@
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 enum ColorTheme {
   LIGHT,
   DARK,
 };
 
-class NetworkTrayView : public views::View {
+class NetworkTrayView : public TrayItemView {
  public:
   NetworkTrayView(ColorTheme size, bool tray_icon)
       : color_theme_(size), tray_icon_(tray_icon) {
     SetLayoutManager(new views::FillLayout());
 
     image_view_ = color_theme_ == DARK ?
         new FixedSizedImageView(0, kTrayPopupItemHeight) :
         new views::ImageView;
     AddChildView(image_view_);
 
@@ skipping 17 matching lines @@
   ColorTheme color_theme_;
   bool tray_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkTrayView);
 };
 
 class NetworkDefaultView : public TrayItemMore {
  public:
   explicit NetworkDefaultView(SystemTrayItem* owner)
       : TrayItemMore(owner) {
-    icon_ = new NetworkTrayView(DARK, false /* tray_icon */);
-    ReplaceIcon(icon_);
     Update();
   }
 
   virtual ~NetworkDefaultView() {}
 
   void Update() {
     NetworkIconInfo info;
     Shell::GetInstance()->tray_delegate()->
         GetMostRelevantNetworkIcon(&info, true);
-    icon_->Update(info);
+    SetImage(&info.image);
     SetLabel(info.description);
     SetAccessibleName(info.description);
   }
 
  private:
-  NetworkTrayView* icon_;
-
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
 class NetworkDetailedView : public views::View,
                             public views::ButtonListener,
                             public ViewClickListener {
  public:
   explicit NetworkDetailedView(user::LoginStatus login)
       : login_(login),
         header_(NULL),
@@ skipping 356 matching lines @@
   if (tray_.get())
     tray_->Update(info);
   if (default_.get())
     default_->Update();
   if (detailed_.get())
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash