mash: Move ash/common/wm/shelf to ash/common/shelf

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/shelf/shelf_layout_manager_observer.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shell_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;
 }
 
@@ skipping 30 matching lines @@
   int GetWorkAreaBottom() const override;
   bool IsTopDown() const override;
   bool IsFromLeft() const override;
   void RecomputeAlignment(const display::Display& display) override;
 
  private:
   friend class AshPopupAlignmentDelegateTest;
   friend class WebNotificationTrayTest;
 
   // Get the current alignment of the shelf.
-  wm::ShelfAlignment GetAlignment() const;
+  ShelfAlignment GetAlignment() const;
 
   // 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;
 
@@ skipping 11 matching lines @@
   gfx::Rect work_area_;
   ShelfLayoutManager* shelf_;
   int system_tray_height_;
 
   DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_