| Index: ash/system/date/tray_date.cc
|
| diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
|
| index 46033d07d1fd4707206d6350ffb8dd578b5fb08e..c64f97e146e6d0ebe8f8213440f752fbf810b999 100644
|
| --- a/ash/system/date/tray_date.cc
|
| +++ b/ash/system/date/tray_date.cc
|
| @@ -124,8 +124,9 @@ class DateDefaultView : public views::View,
|
| namespace ash {
|
| namespace internal {
|
|
|
| -TrayDate::TrayDate()
|
| - : time_tray_(NULL) {
|
| +TrayDate::TrayDate(SystemTray* system_tray)
|
| + : SystemTrayItem(system_tray),
|
| + time_tray_(NULL) {
|
| }
|
|
|
| TrayDate::~TrayDate() {
|
| @@ -134,11 +135,10 @@ TrayDate::~TrayDate() {
|
| views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
|
| CHECK(time_tray_ == NULL);
|
| ClockLayout clock_layout =
|
| - ash::Shell::GetInstance()->system_tray()->shelf_alignment() ==
|
| - SHELF_ALIGNMENT_BOTTOM ?
|
| - HORIZONTAL_CLOCK : VERTICAL_CLOCK;
|
| + system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM ?
|
| + HORIZONTAL_CLOCK : VERTICAL_CLOCK;
|
| time_tray_ = new tray::TimeView(clock_layout);
|
| - views::View* view = new TrayItemView;
|
| + views::View* view = new TrayItemView(this);
|
| view->AddChildView(time_tray_);
|
| return view;
|
| }
|
|
|