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

ash/system/date/tray_date.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/date/tray_date.h"
 
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_default_view.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_item_view.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/system_clock_observer.h"
@@ skipping 30 matching lines @@
   return default_view_;
 }
 
 views::View* TrayDate::CreateDefaultViewForTesting(user::LoginStatus status) {
   return CreateDefaultView(status);
 }
 
 views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
   CHECK(time_tray_ == NULL);
   ClockLayout clock_layout =
-      system_tray()->shelf_alignment() == wm::SHELF_ALIGNMENT_BOTTOM
+      system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM
           ? HORIZONTAL_CLOCK
           : VERTICAL_CLOCK;
   time_tray_ = new tray::TimeView(clock_layout);
   views::View* view = new TrayItemView(this);
   view->AddChildView(time_tray_);
   return view;
 }
 
 views::View* TrayDate::CreateDefaultView(user::LoginStatus status) {
   default_view_ = new DateDefaultView(status);
@@ skipping 18 matching lines @@
 void TrayDate::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
 void TrayDate::DestroyDetailedView() {
 }
 
 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TrayDate::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {
+void TrayDate::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (time_tray_) {
-    ClockLayout clock_layout = wm::IsHorizontalAlignment(alignment)
-                                   ? HORIZONTAL_CLOCK
-                                   : VERTICAL_CLOCK;
+    ClockLayout clock_layout =
+        IsHorizontalAlignment(alignment) ? HORIZONTAL_CLOCK : VERTICAL_CLOCK;
     time_tray_->UpdateClockLayout(clock_layout);
   }
 }
 
 void TrayDate::OnDateFormatChanged() {
   if (time_tray_)
     time_tray_->UpdateTimeFormat();
   if (default_view_)
     default_view_->GetDateView()->UpdateTimeFormat();
 }
@@ skipping 13 matching lines @@
         can_set_time ? TrayDate::SET_SYSTEM_TIME : TrayDate::NONE);
   }
 }
 
 void TrayDate::Refresh() {
   if (time_tray_)
     time_tray_->UpdateText();
 }
 
 }  // namespace ash