mash: Convert AshPopupAlignmentDelegate to wm common types

ash/system/web_notification/ash_popup_alignment_delegate.h

 // 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.
 
 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 #define ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/shell_observer.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/macros.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/views/popup_alignment_delegate.h"
 
 namespace display {
 class Screen;
 }
 
 namespace ash {
 
 class AshPopupAlignmentDelegateTest;
 class ShelfLayoutManager;
 class WebNotificationTrayTest;
+class WmShelf;
 
 // The PopupAlignmentDelegate subclass for Ash. It needs to handle alignment of
 // the shelf and its autohide state.
 class ASH_EXPORT AshPopupAlignmentDelegate
     : public message_center::PopupAlignmentDelegate,
-      public ShelfLayoutManagerObserver,
+      public WmShelfObserver,
       public ShellObserver,
       public display::DisplayObserver {
  public:
-  explicit AshPopupAlignmentDelegate(ShelfLayoutManager* shelf);
+  explicit AshPopupAlignmentDelegate(WmShelf* shelf);
   ~AshPopupAlignmentDelegate() override;
 
   // Start observing the system.
   void StartObserving(display::Screen* screen, const display::Display& display);
 
   // Sets the current height of the system tray so that the notification toasts
   // can avoid it.
   void SetSystemTrayHeight(int height);
 
   // Returns the current system tray height.
@@ skipping 16 matching lines @@
 
   // Utility function to get the display which should be care about.
   display::Display GetCurrentDisplay() const;
 
   // Compute the new work area.
   void UpdateWorkArea();
 
   // Overridden from ShellObserver:
   void OnDisplayWorkAreaInsetsChanged() override;
 
-  // Overridden from ShelfLayoutManagerObserver:
+  // WmShelfObserver:
   void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
 
   // Overridden from display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   display::Screen* screen_;
   gfx::Rect work_area_;
-  ShelfLayoutManager* shelf_;
+  WmShelf* shelf_;
   int system_tray_height_;
 
   DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_