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

ash/system/web_notification/ash_popup_alignment_delegate.cc

 // Copyright 2014 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/ash_popup_alignment_delegate.h"
 
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/i18n/rtl.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_popup_collection.h"
 
 namespace ash {
@@ skipping 69 matching lines @@
 
 int AshPopupAlignmentDelegate::GetWorkAreaBottom() const {
   return work_area_.bottom() - system_tray_height_;
 }
 
 bool AshPopupAlignmentDelegate::IsTopDown() const {
   return false;
 }
 
 bool AshPopupAlignmentDelegate::IsFromLeft() const {
-  return GetAlignment() == wm::SHELF_ALIGNMENT_LEFT;
+  return GetAlignment() == SHELF_ALIGNMENT_LEFT;
 }
 
 void AshPopupAlignmentDelegate::RecomputeAlignment(
     const display::Display& display) {
   // Nothing needs to be done.
 }
 
-wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
+ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }
 
 display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
   return WmLookup::Get()
       ->GetWindowForWidget(shelf_->shelf_widget())
       ->GetDisplayNearestWindow();
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea() {
@@ skipping 22 matching lines @@
     const display::Display& old_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();
 }
 
 }  // namespace ash