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

ash/system/web_notification/web_notification_tray.h

 // Copyright (c) 2012 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_WEB_NOTIFICATION_TRAY_H_
 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 62 matching lines @@
   // Returns true if the mouse is inside the notification bubble.
   bool IsMouseInNotificationBubble() const;
 
   // Shows the message center bubble.
   void ShowMessageCenterBubble();
 
   // Called when the login status is changed.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Overridden from TrayBackgroundView.
-  void SetShelfAlignment(wm::ShelfAlignment alignment) override;
+  void SetShelfAlignment(ShelfAlignment alignment) override;
   void AnchorUpdated() override;
   base::string16 GetAccessibleNameForTray() override;
   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
   void ClickedOutsideBubble() override;
 
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override;
 
   // Overridden from views::TrayBubbleView::Delegate.
   void BubbleViewDestroyed() override;
@@ skipping 83 matching lines @@
   bool should_block_shelf_auto_hide_;
 
   std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_