Index: ash/system/tray/system_tray.cc |
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc |
index 6be418a7d7aa118e1e11423cb3a0535a09d070d3..3f4d5db032c76c458d83db2783b84a330bee9f07 100644 |
--- a/ash/system/tray/system_tray.cc |
+++ b/ash/system/tray/system_tray.cc |
@@ -324,7 +324,7 @@ void SystemTray::UpdateAfterLoginStatusChange(user::LoginStatus login_status) { |
PreferredSizeChanged(); |
} |
-void SystemTray::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
+void SystemTray::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) { |
for (SystemTrayItem* item : items_) |
item->UpdateAfterShelfAlignmentChange(alignment); |
} |
@@ -611,7 +611,7 @@ base::string16 SystemTray::GetAccessibleTimeString( |
now, hour_type, base::kKeepAmPm); |
} |
-void SystemTray::SetShelfAlignment(ShelfAlignment alignment) { |
+void SystemTray::SetShelfAlignment(wm::ShelfAlignment alignment) { |
if (alignment == shelf_alignment()) |
return; |
TrayBackgroundView::SetShelfAlignment(alignment); |