| Index: ash/system/date/tray_date.cc
|
| diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
|
| index dc0ace711f71303b1641f1c7e378c891a9fda013..052a1aed582e41780aa05f9badbac15fbb4da2cb 100644
|
| --- a/ash/system/date/tray_date.cc
|
| +++ b/ash/system/date/tray_date.cc
|
| @@ -54,7 +54,7 @@ views::View* TrayDate::CreateDefaultViewForTesting(user::LoginStatus status) {
|
| views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
|
| CHECK(time_tray_ == NULL);
|
| ClockLayout clock_layout =
|
| - system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM
|
| + system_tray()->shelf_alignment() == wm::SHELF_ALIGNMENT_BOTTOM
|
| ? HORIZONTAL_CLOCK
|
| : VERTICAL_CLOCK;
|
| time_tray_ = new tray::TimeView(clock_layout);
|
| @@ -93,7 +93,7 @@ void TrayDate::DestroyDetailedView() {
|
| void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| }
|
|
|
| -void TrayDate::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| +void TrayDate::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {
|
| if (time_tray_) {
|
| ClockLayout clock_layout =
|
| IsHorizontalAlignment(alignment) ? HORIZONTAL_CLOCK : VERTICAL_CLOCK;
|
|
|