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

Unified Diff: ash/mus/shelf_delegate_mus.cc

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo Created 4 years, 7 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/mus/shelf_delegate_mus.cc
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc
index 3fa2e0e2b6ea8ce501ae8ebd92fc9cba79a7a134..7626cbcdee7653935c97e1954a77ddf09811d6e9 100644
--- a/ash/mus/shelf_delegate_mus.cc
+++ b/ash/mus/shelf_delegate_mus.cc
@@ -286,14 +286,13 @@ void ShelfDelegateMus::AddObserver(
void ShelfDelegateMus::SetAlignment(mash::shelf::mojom::Alignment alignment) {
wm::ShelfAlignment value = static_cast<wm::ShelfAlignment>(alignment);
- Shell::GetInstance()->SetShelfAlignment(value, Shell::GetPrimaryRootWindow());
+ Shelf::ForPrimaryDisplay()->SetAlignment(value);
}
void ShelfDelegateMus::SetAutoHideBehavior(
mash::shelf::mojom::AutoHideBehavior auto_hide) {
ShelfAutoHideBehavior value = static_cast<ShelfAutoHideBehavior>(auto_hide);
- Shell::GetInstance()->SetShelfAutoHideBehavior(value,
- Shell::GetPrimaryRootWindow());
+ Shelf::ForPrimaryDisplay()->SetAutoHideBehavior(value);
}
void ShelfDelegateMus::PinItem(

Powered by Google App Engine
This is Rietveld 408576698