mash: Migrate shelf menus to wm common types

ash/metrics/user_metrics_recorder.cc

 // Copyright 2013 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/metrics/user_metrics_recorder.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 274 matching lines @@
       base::RecordAction(base::UserMetricsAction("Mouse_Down"));
       break;
     case ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK:
       base::RecordAction(
          base::UserMetricsAction("Panel_Minimize_Caption_Click"));
       break;
     case ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE:
       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"));
       break;
     case ash::UMA_STATUS_AREA_AUDIO_CURRENT_OUTPUT_DEVICE:
       base::RecordAction(
           base::UserMetricsAction("StatusArea_Audio_CurrentOutputDevice"));
       break;
     case ash::UMA_STATUS_AREA_AUDIO_SWITCH_INPUT_DEVICE:
       base::RecordAction(
@@ skipping 274 matching lines @@
 
 void UserMetricsRecorder::RecordUserMetricsAction(
     wm::WmUserMetricsAction action) {
   switch (action) {
     case wm::WmUserMetricsAction::DRAG_MAXIMIZE_LEFT:
       base::RecordAction(base::UserMetricsAction("WindowDrag_MaximizeLeft"));
       break;
     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;
     case wm::WmUserMetricsAction::WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED:
       base::RecordAction(
           base::UserMetricsAction("WindowSelector_ActiveWindowChanged"));
       task_switch_metrics_recorder_.OnTaskSwitch(
           TaskSwitchMetricsRecorder::OVERVIEW_MODE);
       break;
     case wm::WmUserMetricsAction::WINDOW_OVERVIEW_ENTER_KEY:
@@ skipping 49 matching lines @@
   return IsUserActive() && !IsKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this, &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 }  // namespace ash