ash: Move shelf alignment and auto-hide calls from Shell to Shelf

ash/sysui/shelf_delegate_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/sysui/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
@@ skipping 268 matching lines @@
   observer_ptr->OnAlignmentChanged(
       static_cast<mash::shelf::mojom::Alignment>(shelf->alignment()));
   observer_ptr->OnAutoHideBehaviorChanged(
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
           shelf->auto_hide_behavior()));
   observers_.AddPtr(std::move(observer_ptr));
 }
 
 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(
     mash::shelf::mojom::ShelfItemPtr item,
     mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) {
   std::string app_id(item->app_id.To<std::string>());
   if (app_id_to_shelf_id_.count(app_id)) {
     ShelfID shelf_id = app_id_to_shelf_id_[app_id];
     ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
     item_delegate->SetDelegate(std::move(delegate));
@@ skipping 167 matching lines @@
   StatusAreaWidget* status_widget = widget->status_area_widget();
   mus::Window* status_window =
       aura::GetMusWindow(status_widget->GetNativeWindow());
   gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
   status_window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, status_size);
 }
 
 }  // namespace sysui
 }  // namespace ash