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

Unified Diff: ash/sysui/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: rebase 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
« no previous file with comments | « ash/sysui/context_menu_mus.cc ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/shelf_delegate_mus.cc
diff --git a/ash/sysui/shelf_delegate_mus.cc b/ash/sysui/shelf_delegate_mus.cc
index d41b36f9fb3d3bdba517558c96cf232be4d72b77..3855cc621e12412968f8ee616aad8b0e0f2c6a23 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/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(
« no previous file with comments | « ash/sysui/context_menu_mus.cc ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698