chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_locking_manager.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/shelf/shelf_locking_manager.h"
 
 #include "ash/session/session_controller.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 
 namespace ash {
 
-ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)
+ShelfLockingManager::ShelfLockingManager(Shelf* shelf)
     : shelf_(shelf),
       stored_alignment_(SHELF_ALIGNMENT_BOTTOM_LOCKED),
       scoped_session_observer_(this) {
   DCHECK(shelf_);
   ShellPort::Get()->AddLockStateObserver(this);
   SessionController* controller = Shell::Get()->session_controller();
   session_locked_ =
       controller->GetSessionState() != session_manager::SessionState::ACTIVE;
   screen_locked_ = controller->IsScreenLocked();
 }
@@ skipping 13 matching lines @@
   UpdateLockedState();
 }
 
 void ShelfLockingManager::OnLockStateEvent(EventType event) {
   // Lock when the animation starts, ignoring pre-lock. There's no unlock event.
   screen_locked_ |= event == EVENT_LOCK_ANIMATION_STARTED;
   UpdateLockedState();
 }
 
 void ShelfLockingManager::UpdateLockedState() {
-  const ShelfAlignment alignment = shelf_->GetAlignment();
+  const ShelfAlignment alignment = shelf_->alignment();
   if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     stored_alignment_ = alignment;
     shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
   } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_->SetAlignment(stored_alignment_);
   }
 }
 
 }  // namespace ash