Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1854)

Unified Diff: ash/system/date/tray_date.cc

Issue 9969068: ash: Animate changes in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/ime/tray_ime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index d38e191f9aed0c797674110e9ed190923d266b18..bead9706504f992cb4c546cb40b79b85e00d4955 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -8,6 +8,7 @@
#include "ash/system/date/date_view.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/i18n/time_formatting.h"
#include "base/stringprintf.h"
@@ -24,7 +25,6 @@
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
-#include "ui/views/layout/fill_layout.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -49,7 +49,10 @@ views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
gfx::Font font = date_tray_->label()->font();
date_tray_->label()->SetFont(
font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
- return date_tray_.get();
+
+ views::View* view = new TrayItemView;
+ view->AddChildView(date_tray_.get());
+ return view;
}
views::View* TrayDate::CreateDefaultView(user::LoginStatus status) {
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/ime/tray_ime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698