mash: Migrate tray date view to //ash/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 2d090b6af4ba7740abf1c10809ef0d5b851e4698..3340d097e5983b681e741a059226f7426bea0b52 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -533,18 +533,9 @@ void UserMetricsRecorder::RecordUserMetricsAction(UserMetricsAction action) {
     case ash::UMA_TOUCHSCREEN_TAP_DOWN:
       base::RecordAction(base::UserMetricsAction("Touchscreen_Down"));
       break;
-    case ash::UMA_TRAY_HELP:
-      base::RecordAction(base::UserMetricsAction("Tray_Help"));
-      break;
-    case ash::UMA_TRAY_LOCK_SCREEN:
-      base::RecordAction(base::UserMetricsAction("Tray_LockScreen"));
-      break;
     case ash::UMA_TRAY_OVERVIEW:
       base::RecordAction(base::UserMetricsAction("Tray_Overview"));
       break;
-    case ash::UMA_TRAY_SHUT_DOWN:
-      base::RecordAction(base::UserMetricsAction("Tray_ShutDown"));
-      break;
     case ash::UMA_WINDOW_APP_CLOSE_BUTTON_CLICK:
       base::RecordAction(base::UserMetricsAction("AppCloseButton_Clk"));
       break;
@@ -596,6 +587,15 @@ void UserMetricsRecorder::RecordUserMetricsAction(
     case wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_RIGHT:
       base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetRight"));
       break;
+    case wm::WmUserMetricsAction::TRAY_HELP:
+      base::RecordAction(base::UserMetricsAction("Tray_Help"));
+      break;
+    case wm::WmUserMetricsAction::TRAY_LOCK_SCREEN:
+      base::RecordAction(base::UserMetricsAction("Tray_LockScreen"));
+      break;
+    case wm::WmUserMetricsAction::TRAY_SHUT_DOWN:
+      base::RecordAction(base::UserMetricsAction("Tray_ShutDown"));
+      break;
     case wm::WmUserMetricsAction::WINDOW_OVERVIEW:
       base::RecordAction(base::UserMetricsAction("WindowSelector_Overview"));
       break;