chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_window_targeter.cc

Index: ash/shelf/shelf_window_targeter.cc
diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc
index 6668ad53649a1637d3a9419c4106511b877e8c99..eb377a1dd203d3a8f3d69436873260af2da83af1 100644
--- a/ash/shelf/shelf_window_targeter.cc
+++ b/ash/shelf/shelf_window_targeter.cc
@@ -5,8 +5,8 @@
 #include "ash/shelf/shelf_window_targeter.h"
 
 #include "ash/public/cpp/shelf_types.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/wm_window.h"
 #include "ui/aura/window.h"
 
@@ -24,7 +24,7 @@ gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) {
 
 }  // namespace
 
-ShelfWindowTargeter::ShelfWindowTargeter(WmWindow* container, WmShelf* shelf)
+ShelfWindowTargeter::ShelfWindowTargeter(WmWindow* container, Shelf* shelf)
     : ::wm::EasyResizeWindowTargeter(WmWindow::GetAuraWindow(container),
                                      gfx::Insets(),
                                      gfx::Insets()),
@@ -52,13 +52,13 @@ void ShelfWindowTargeter::WillChangeVisibilityState(
   if (new_state == SHELF_VISIBLE) {
     // Let clicks at the very top of the shelf through so windows can be
     // resized with the bottom-right corner and bottom edge.
-    mouse_insets = GetInsetsForAlignment(kWorkspaceAreaVisibleInset,
-                                         shelf_->GetAlignment());
+    mouse_insets =
+        GetInsetsForAlignment(kWorkspaceAreaVisibleInset, shelf_->alignment());
   } else if (new_state == SHELF_AUTO_HIDE) {
     // Extend the touch hit target out a bit to allow users to drag shelf out
     // while hidden.
     touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset,
-                                         shelf_->GetAlignment());
+                                         shelf_->alignment());
   }
 
   set_mouse_extend(mouse_insets);