mash: Migrate tray date view to //ash/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 515 matching lines @@
           base::UserMetricsAction(
               "WindowBorder_ClickTogglesSingleAxisMaximize"));
       break;
     case ash::UMA_TOUCHPAD_GESTURE_OVERVIEW:
       base::RecordAction(
           base::UserMetricsAction("Touchpad_Gesture_Overview"));
       break;
     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;
     case ash::UMA_WINDOW_CLOSE_BUTTON_CLICK:
       base::RecordAction(base::UserMetricsAction("CloseButton_Clk"));
       break;
     case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN:
       base::RecordAction(base::UserMetricsAction("MaxButton_Clk_ExitFS"));
       break;
     case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE:
@@ skipping 31 matching lines @@
       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::TRAY_HELP:

[msw, 2016/06/14 00:18:26]

Why are we moving these metrics enum values in a piecemeal fashion?
(what makes a value Wm* compatible or not? can we move them all at once?)

[James Cook, 2016/06/14 16:54:07]

Good point. I think this dates back to when the window manager was a separate
binary.

How about I collapse the Wm and non-Wm versions of all these enums into a single
enum in a header file in //ash/common/metrics/? What do you think of just
calling it ash::UserMetricsAction?  (There's already a user_metrics_action.h in
//base/metrics, but it's in namespace base::.) Alternately, ash::UserMetric?

If that sounds good I'll do a separate CL that moves everything.

(And BTW I really appreciate that you pick up on "why are we doing this?" issues
like this.)

[msw, 2016/06/14 17:08:51]

sgtm with ash::UserMetricsAction (current non-common name)

+      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;
     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