chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_locking_manager.cc

Index: ash/shelf/shelf_locking_manager.cc
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc
index cb221d4bb951ffa45d8c73b13eda4263dfbd8221..c7742e8729b7248a1bec834ef71eb9467ea118f7 100644
--- a/ash/shelf/shelf_locking_manager.cc
+++ b/ash/shelf/shelf_locking_manager.cc
@@ -5,13 +5,13 @@
 #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) {
@@ -45,7 +45,7 @@ void ShelfLockingManager::OnLockStateEvent(EventType event) {
 }
 
 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);