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

ash/system/chromeos/network/tray_network.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_network.h"
 
 #include "ash/ash_switches.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
@@ skipping 66 matching lines @@
     const NetworkState* connected_network =
         handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
     if (connected_network) {
       UpdateConnectionStatus(base::UTF8ToUTF16(connected_network->name()),
                              true);
     } else {
       UpdateConnectionStatus(base::string16(), false);
     }
   }
 
-  void UpdateAlignment(wm::ShelfAlignment alignment) {
-    SetLayoutManager(new views::BoxLayout(wm::IsHorizontalAlignment(alignment)
+  void UpdateAlignment(ShelfAlignment alignment) {
+    SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
                                               ? views::BoxLayout::kHorizontal
                                               : views::BoxLayout::kVertical,
                                           0, 0, 0));
     Layout();
   }
 
   // views::View override.
   void GetAccessibleState(ui::AXViewState* state) override {
     state->name = connection_status_string_;
     state->role = ui::AX_ROLE_BUTTON;
@@ skipping 190 matching lines @@
   default_ = NULL;
 }
 
 void TrayNetwork::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TrayNetwork::UpdateAfterShelfAlignmentChange(
-    wm::ShelfAlignment alignment) {
+void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_) {
     SetTrayImageItemBorder(tray_, alignment);
     tray_->UpdateAlignment(alignment);
   }
 }
 
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
@@ skipping 17 matching lines @@
 void TrayNetwork::NetworkStateChanged() {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash