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

ash/system/web_notification/ash_popup_alignment_delegate.cc

Index: ash/system/web_notification/ash_popup_alignment_delegate.cc
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc
index e6a657671b2253038f9b8214725e376b58b0c854..11eb077d38b5dd4727d1d3fd7f7b98bb5bb0a7a7 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -4,12 +4,12 @@
 
 #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"
@@ -99,7 +99,7 @@ bool AshPopupAlignmentDelegate::IsTopDown() const {
 }
 
 bool AshPopupAlignmentDelegate::IsFromLeft() const {
-  return GetAlignment() == wm::SHELF_ALIGNMENT_LEFT;
+  return GetAlignment() == SHELF_ALIGNMENT_LEFT;
 }
 
 void AshPopupAlignmentDelegate::RecomputeAlignment(
@@ -107,7 +107,7 @@ void AshPopupAlignmentDelegate::RecomputeAlignment(
   // Nothing needs to be done.
 }
 
-wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
+ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }