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

Unified Diff: ash/system/tray/system_tray.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: merge 2 trunk Created 4 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
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);

Powered by Google App Engine
This is Rietveld 408576698