ash: Move more code from Shelf to WmShelf

ash/common/shelf/shelf_widget.h

Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index d87e61a0b87ddf375f4fcd03fa04d8c97c5aa029..ac43c023ea1b8ea464e2fc67b2f4f134e37e3e40 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -90,6 +90,12 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
   // Force the shelf to be presented in an undimmed state.
   void ForceUndimming(bool force);
 
+  // See WmShelf::UpdateIconPositionForPanel().
+  void UpdateIconPositionForPanel(WmWindow* panel);
+
+  // See WmShelf::GetScreenBoundsOfItemIconForWindow().
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
+
   // Overridden from views::WidgetObserver:
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;