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

ash/system/status_area_widget.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/status_area_widget.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 156 matching lines @@
   virtual_keyboard_tray_ = new VirtualKeyboardTray(this);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
 #endif
 
 void StatusAreaWidget::AddOverviewButtonTray() {
   overview_button_tray_ = new OverviewButtonTray(this);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
-void StatusAreaWidget::SetShelfAlignment(wm::ShelfAlignment alignment) {
+void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
     system_tray_->SetShelfAlignment(alignment);
   if (web_notification_tray_)
     web_notification_tray_->SetShelfAlignment(alignment);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->SetShelfAlignment(alignment);
   if (virtual_keyboard_tray_)
     virtual_keyboard_tray_->SetShelfAlignment(alignment);
@@ skipping 19 matching lines @@
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace ash