Revise the shelf alignment locking mechanism.

ash/mus/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/mus/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
@@ skipping 117 matching lines @@
   SetShelfPreferredSizes(shelf);
 }
 
 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) {
   NOTIMPLEMENTED();
 }
 
 void ShelfDelegateMus::OnShelfAlignmentChanged(Shelf* shelf) {
   SetShelfPreferredSizes(shelf);
   mash::shelf::mojom::Alignment alignment =
-      static_cast<mash::shelf::mojom::Alignment>(shelf->GetAlignment());
+      static_cast<mash::shelf::mojom::Alignment>(shelf->alignment());
   shelf_layout_->SetAlignment(alignment);
 
   observers_.ForAllPtrs(
       [alignment](mash::shelf::mojom::ShelfObserver* observer) {
         observer->OnAlignmentChanged(alignment);
       });
 }
 
 void ShelfDelegateMus::OnShelfAutoHideBehaviorChanged(Shelf* shelf) {
   mash::shelf::mojom::AutoHideBehavior behavior =
@@ skipping 35 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void ShelfDelegateMus::AddObserver(
     mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) {
   mash::shelf::mojom::ShelfObserverAssociatedPtr observer_ptr;
   observer_ptr.Bind(std::move(observer));
   // Notify the observer of the current state.
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   observer_ptr->OnAlignmentChanged(
-      static_cast<mash::shelf::mojom::Alignment>(shelf->GetAlignment()));
+      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) {
   ShelfAlignment value = static_cast<ShelfAlignment>(alignment);
   Shell::GetInstance()->SetShelfAlignment(value, Shell::GetPrimaryRootWindow());
 }
@@ skipping 125 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