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

ash/system/tray/system_tray_item.cc

 // 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.
 
 #include "ash/system/tray/system_tray_item.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ui/views/view.h"
@@ skipping 36 matching lines @@
 void SystemTrayItem::DestroyNotificationView() {
 }
 
 void SystemTrayItem::TransitionDetailedView() {
   system_tray()->ShowDetailedView(this, 0, true, BUBBLE_USE_EXISTING);
 }
 
 void SystemTrayItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void SystemTrayItem::UpdateAfterShelfAlignmentChange(
-    wm::ShelfAlignment alignment) {}
+void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+}
 
 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
   system_tray()->ShowDetailedView(
       this, for_seconds, activate, BUBBLE_CREATE_NEW);
 }
 
 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
   system_tray()->SetDetailedViewCloseDelay(for_seconds);
 }
 
@@ skipping 11 matching lines @@
 
 bool SystemTrayItem::ShouldHideArrow() const {
   return false;
 }
 
 bool SystemTrayItem::ShouldShowShelf() const {
   return true;
 }
 
 }  // namespace ash