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

ash/system/web_notification/web_notification_tray.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/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
@@ skipping 222 matching lines @@
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(
           message_center(),
           message_center_tray_.get(),
           true);
 
   int max_height;
-  if (wm::IsHorizontalAlignment(GetShelfLayoutManager()->GetAlignment())) {
+  if (IsHorizontalAlignment(GetShelfLayoutManager()->GetAlignment())) {
     max_height = GetShelfLayoutManager()->GetIdealBounds().y();
   } else {
     // Assume the status area and bubble bottoms are aligned when vertical.
     WmWindow* status_area_window =
         WmLookup::Get()->GetWindowForWidget(status_area_widget());
     gfx::Rect bounds_in_root =
         status_area_window->GetRootWindow()->ConvertRectFromScreen(
             status_area_window->GetBoundsInScreen());
     max_height = bounds_in_root.bottom();
   }
@@ skipping 71 matching lines @@
   if (!IsMessageCenterBubbleVisible())
     message_center_tray_->ShowMessageCenterBubble();
 }
 
 void WebNotificationTray::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   message_center()->SetLockedState(login_status == user::LOGGED_IN_LOCKED);
   OnMessageCenterTrayChanged();
 }
 
-void WebNotificationTray::SetShelfAlignment(wm::ShelfAlignment alignment) {
+void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
   // Destroy any existing bubble so that it will be rebuilt correctly.
   message_center_tray_->HideMessageCenterBubble();
   message_center_tray_->HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
@@ skipping 158 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash