mash: Migrate shelf menus to wm common types

ash/metrics/user_metrics_recorder.cc

Index: ash/metrics/user_metrics_recorder.cc
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index 3e2873628c4e18042dbd14c12e0ba4d29e13ab5e..32fa5197b7dedb020862f4816c93cb431fc28d65 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -292,18 +292,6 @@ void UserMetricsRecorder::RecordUserMetricsAction(UserMetricsAction action) {
       base::RecordAction(
           base::UserMetricsAction("Panel_Minimize_Caption_Gesture"));
       break;
-    case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM:
-      base::RecordAction(
-          base::UserMetricsAction("Shelf_AlignmentSetBottom"));
-      break;
-    case ash::UMA_SHELF_ALIGNMENT_SET_LEFT:
-      base::RecordAction(
-          base::UserMetricsAction("Shelf_AlignmentSetLeft"));
-      break;
-    case ash::UMA_SHELF_ALIGNMENT_SET_RIGHT:
-      base::RecordAction(
-          base::UserMetricsAction("Shelf_AlignmentSetRight"));
-      break;
     case ash::UMA_STATUS_AREA_AUDIO_CURRENT_INPUT_DEVICE:
       base::RecordAction(
           base::UserMetricsAction("StatusArea_Audio_CurrentInputDevice"));
@@ -598,6 +586,15 @@ void UserMetricsRecorder::RecordUserMetricsAction(
     case wm::WmUserMetricsAction::DRAG_MAXIMIZE_RIGHT:
       base::RecordAction(base::UserMetricsAction("WindowDrag_MaximizeRight"));
       break;
+    case wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_BOTTOM:
+      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetBottom"));
+      break;
+    case wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_LEFT:
+      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetLeft"));
+      break;
+    case wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_RIGHT:
+      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetRight"));
+      break;
     case wm::WmUserMetricsAction::WINDOW_OVERVIEW:
       base::RecordAction(base::UserMetricsAction("WindowSelector_Overview"));
       break;