ash: Animate changes in the uber tray.

ash/system/ime/tray_ime.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/ime/tray_ime.h"
 
 #include <vector>
 
 #include "ash/shell.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/logging.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 155 matching lines @@
 
 }  // namespace tray
 
 TrayIME::TrayIME() {
 }
 
 TrayIME::~TrayIME() {
 }
 
 void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
-  tray_label_->SetText(current.short_name);
+  tray_label_->label()->SetText(current.short_name);
   tray_label_->SetVisible(count > 1);
 }
 
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
-  tray_label_.reset(new views::Label);
-  SetupLabelForTray(tray_label_.get());
+  tray_label_.reset(new TrayItemView);
+  tray_label_->CreateLabel();
+  SetupLabelForTray(tray_label_->label());
   tray_label_->set_border(
       views::Border::CreateEmptyBorder(0, 2, 0, 2));
   return tray_label_.get();
 }
 
 views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   IMEInfoList list;
   IMEPropertyInfoList property_list;
   delegate->GetAvailableIMEList(&list);
@@ skipping 33 matching lines @@
   UpdateTrayLabel(current, list.size());
 
   if (default_.get())
     default_->UpdateLabel(current);
   if (detailed_.get())
     detailed_->Update(list, property_list);
 }
 
 }  // namespace internal
 }  // namespace ash