mash: Convert ShelfView to wm common types, clean up Shelf access

ash/shelf/shelf.cc

Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 74db518ded0b161c94febc3072c5e1597a44bf0b..d519ef1a80ea40665e0ef9602a865350a617dda6 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -12,14 +12,13 @@
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_navigator.h"
-#include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
-#include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
@@ -47,7 +46,7 @@ Shelf::Shelf(ShelfModel* shelf_model,
       shelf_view_(new ShelfView(shelf_model,
                                 WmShell::Get()->shelf_delegate(),
                                 wm_shelf,
-                                this)),
+                                shelf_widget)),
       shelf_locking_manager_(wm_shelf) {
   DCHECK(wm_shelf_);
   shelf_view_->Init();
@@ -90,10 +89,6 @@ void Shelf::SetAlignment(ShelfAlignment alignment) {
   // ShelfLayoutManager will resize the shelf.
 }
 
-bool Shelf::IsHorizontalAlignment() const {
-  return ::ash::IsHorizontalAlignment(alignment_);
-}
-
 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;