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

ash/system/tray/system_tray_item.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_TRAY_SYSTEM_TRAY_ITEM_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
 
 #include "ash/ash_export.h"
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 
 namespace views {
 class View;
 }
 
 namespace ash {
 class SystemTray;
@@ skipping 36 matching lines @@
   virtual void DestroyNotificationView();
 
   // Updates the tray view (if applicable) when the user's login status changes.
   // It is not necessary the update the default or detailed view, since the
   // default/detailed popup is closed when login status changes. The default
   // implementation does nothing.
   virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
 
   // Updates the tray view (if applicable) when shelf's alignment changes.
   // The default implementation does nothing.
-  virtual void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment);
+  virtual void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
 
   // Shows the detailed view for this item. If the main popup for the tray is
   // currently visible, then making this call would use the existing window to
   // display the detailed item. The detailed item will inherit the bounds of the
   // existing window.
   // If there is no existing view, then this is equivalent to calling
   // PopupDetailedView(0, true).
   void TransitionDetailedView();
 
   // Pops up the detailed view for this item. An item can request to show its
@@ skipping 35 matching lines @@
  private:
   SystemTray* system_tray_;
   bool restore_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_