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

ash/wm/panels/attached_panel_window_targeter.cc

 // Copyright 2014 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/wm/panels/attached_panel_window_targeter.h"
 
-#include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 AttachedPanelWindowTargeter::AttachedPanelWindowTargeter(
     aura::Window* container,
     const gfx::Insets& default_mouse_extend,
@@ skipping 27 matching lines @@
 }
 
 void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {
   // Only update the touch insets for panels if they are attached to the shelf
   // in |root_window|.
   if (panel_container_->GetRootWindow() != root_window)
     return;
 
   DCHECK(panel_layout_manager_->shelf());
   gfx::Insets touch(default_touch_extend_);
-  set_touch_extend(
-      WmShelfAura::GetShelf(panel_layout_manager_->shelf())
-          ->SelectValueForShelfAlignment(
-              gfx::Insets(touch.top(), touch.left(), 0, touch.right()),
-              gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()),
-              gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0)));
+  switch (panel_layout_manager_->shelf()->GetAlignment()) {
+    case SHELF_ALIGNMENT_BOTTOM:
+    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      set_touch_extend(
+          gfx::Insets(touch.top(), touch.left(), 0, touch.right()));
+      break;
+    case SHELF_ALIGNMENT_LEFT:
+      set_touch_extend(
+          gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()));
+      break;
+    case SHELF_ALIGNMENT_RIGHT:
+      set_touch_extend(
+          gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0));
+      break;
+  }
 }
 
 }  // namespace ash