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

ash/system/chromeos/network/tray_vpn.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/chromeos/network/tray_vpn.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
@@ skipping 152 matching lines @@
   default_ = NULL;
 }
 
 void TrayVPN::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayVPN::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TrayVPN::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {}
+void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash