| Index: ash/metrics/user_metrics_recorder.h
|
| diff --git a/ash/metrics/user_metrics_recorder.h b/ash/metrics/user_metrics_recorder.h
|
| index a482e43a5461242bcb6ce7fc1b9d535822f3f909..37cb26e685345c4c7f7f9b175c3d197e47394d67 100644
|
| --- a/ash/metrics/user_metrics_recorder.h
|
| +++ b/ash/metrics/user_metrics_recorder.h
|
| @@ -8,6 +8,7 @@
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ash/common/metrics/user_metrics_action.h"
|
| #include "ash/metrics/task_switch_metrics_recorder.h"
|
| #include "base/macros.h"
|
| #include "base/timer/timer.h"
|
| @@ -20,112 +21,6 @@ namespace test {
|
| class UserMetricsRecorderTestAPI;
|
| }
|
|
|
| -namespace wm {
|
| -enum class WmUserMetricsAction;
|
| -}
|
| -
|
| -enum UserMetricsAction {
|
| - UMA_ACCEL_EXIT_FIRST_Q,
|
| - UMA_ACCEL_EXIT_SECOND_Q,
|
| - UMA_ACCEL_KEYBOARD_BRIGHTNESS_DOWN_F6,
|
| - UMA_ACCEL_KEYBOARD_BRIGHTNESS_UP_F7,
|
| - UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON,
|
| - UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON,
|
| - UMA_ACCEL_MAXIMIZE_RESTORE_F4,
|
| - UMA_ACCEL_PREVWINDOW_F5,
|
| - UMA_ACCEL_RESTART_POWER_BUTTON,
|
| - UMA_ACCEL_SHUT_DOWN_POWER_BUTTON,
|
| - UMA_CLOSE_THROUGH_CONTEXT_MENU,
|
| - UMA_DESKTOP_SWITCH_TASK,
|
| - UMA_LAUNCHER_BUTTON_PRESSED_WITH_MOUSE,
|
| - UMA_LAUNCHER_BUTTON_PRESSED_WITH_TOUCH,
|
| - UMA_LAUNCHER_CLICK_ON_APP,
|
| - UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON,
|
| - UMA_LAUNCHER_LAUNCH_TASK,
|
| - UMA_LAUNCHER_MINIMIZE_TASK,
|
| - UMA_LAUNCHER_SWITCH_TASK,
|
| - UMA_MAXIMIZE_MODE_DISABLED,
|
| - UMA_MAXIMIZE_MODE_ENABLED,
|
| - UMA_MAXIMIZE_MODE_INITIALLY_DISABLED,
|
| - UMA_MOUSE_DOWN,
|
| - UMA_PANEL_MINIMIZE_CAPTION_CLICK,
|
| - UMA_PANEL_MINIMIZE_CAPTION_GESTURE,
|
| - UMA_STATUS_AREA_AUDIO_CURRENT_INPUT_DEVICE,
|
| - UMA_STATUS_AREA_AUDIO_CURRENT_OUTPUT_DEVICE,
|
| - UMA_STATUS_AREA_AUDIO_SWITCH_INPUT_DEVICE,
|
| - UMA_STATUS_AREA_AUDIO_SWITCH_OUTPUT_DEVICE,
|
| - UMA_STATUS_AREA_BRIGHTNESS_CHANGED,
|
| - UMA_STATUS_AREA_BLUETOOTH_CONNECT_KNOWN_DEVICE,
|
| - UMA_STATUS_AREA_BLUETOOTH_CONNECT_UNKNOWN_DEVICE,
|
| - UMA_STATUS_AREA_BLUETOOTH_DISABLED,
|
| - UMA_STATUS_AREA_BLUETOOTH_ENABLED,
|
| - UMA_STATUS_AREA_CAPS_LOCK_DETAILED,
|
| - UMA_STATUS_AREA_CAPS_LOCK_DISABLED_BY_CLICK,
|
| - UMA_STATUS_AREA_CAPS_LOCK_ENABLED_BY_CLICK,
|
| - UMA_STATUS_AREA_CAPS_LOCK_POPUP,
|
| - UMA_STATUS_AREA_CAST_STOP_CAST,
|
| - UMA_STATUS_AREA_CONNECT_TO_CONFIGURED_NETWORK,
|
| - UMA_STATUS_AREA_CONNECT_TO_UNCONFIGURED_NETWORK,
|
| - UMA_STATUS_AREA_CONNECT_TO_VPN,
|
| - UMA_STATUS_AREA_CHANGED_VOLUME_MENU,
|
| - UMA_STATUS_AREA_CHANGED_VOLUME_POPUP,
|
| - UMA_STATUS_AREA_DETAILED_ACCESSABILITY,
|
| - UMA_STATUS_AREA_DETAILED_AUDIO_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_BLUETOOTH_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_CAST_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST,
|
| - UMA_STATUS_AREA_DETAILED_DRIVE_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_NETWORK_VIEW,
|
| - UMA_STATUS_AREA_DETAILED_VPN_VIEW,
|
| - UMA_STATUS_AREA_DISABLE_AUTO_CLICK,
|
| - UMA_STATUS_AREA_DISABLE_HIGH_CONTRAST,
|
| - UMA_STATUS_AREA_DISABLE_LARGE_CURSOR,
|
| - UMA_STATUS_AREA_DISABLE_MAGNIFIER,
|
| - UMA_STATUS_AREA_DISABLE_SPOKEN_FEEDBACK,
|
| - UMA_STATUS_AREA_DISABLE_WIFI,
|
| - UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD,
|
| - UMA_STATUS_AREA_DRIVE_CANCEL_OPERATION,
|
| - UMA_STATUS_AREA_DRIVE_SETTINGS,
|
| - UMA_STATUS_AREA_ENABLE_AUTO_CLICK,
|
| - UMA_STATUS_AREA_ENABLE_HIGH_CONTRAST,
|
| - UMA_STATUS_AREA_ENABLE_LARGE_CURSOR,
|
| - UMA_STATUS_AREA_ENABLE_MAGNIFIER,
|
| - UMA_STATUS_AREA_ENABLE_SPOKEN_FEEDBACK,
|
| - UMA_STATUS_AREA_ENABLE_WIFI,
|
| - UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD,
|
| - UMA_STATUS_AREA_IME_SHOW_DETAILED,
|
| - UMA_STATUS_AREA_IME_SWITCH_MODE,
|
| - UMA_STATUS_AREA_MENU_OPENED,
|
| - UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED,
|
| - UMA_STATUS_AREA_NETWORK_SETTINGS_CLICKED,
|
| - UMA_STATUS_AREA_SHOW_NETWORK_CONNECTION_DETAILS,
|
| - UMA_STATUS_AREA_SHOW_VPN_CONNECTION_DETAILS,
|
| - UMA_STATUS_AREA_SIGN_OUT,
|
| - UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED,
|
| - UMA_STATUS_AREA_VPN_ADD_THIRD_PARTY_CLICKED,
|
| - UMA_STATUS_AREA_VPN_DISCONNECT_CLICKED,
|
| - UMA_STATUS_AREA_VPN_SETTINGS_CLICKED,
|
| - UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK,
|
| - UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE,
|
| - UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK,
|
| - UMA_TOUCHPAD_GESTURE_OVERVIEW,
|
| - UMA_TOUCHSCREEN_TAP_DOWN,
|
| - UMA_TRAY_OVERVIEW,
|
| - UMA_WINDOW_APP_CLOSE_BUTTON_CLICK,
|
| - UMA_WINDOW_CLOSE_BUTTON_CLICK,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MINIMIZE,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT,
|
| - UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT,
|
| -
|
| - // Window selection started by beginning an alt+tab cycle. This does not count
|
| - // each step through an alt+tab cycle.
|
| - UMA_WINDOW_CYCLE,
|
| -};
|
| -
|
| // User Metrics Recorder provides a repeating callback (RecordPeriodicMetrics)
|
| // on a timer to allow recording of state data over time to the UMA records.
|
| // Any additional states (in ash) that require monitoring can be added to
|
| @@ -140,8 +35,7 @@ class ASH_EXPORT UserMetricsRecorder {
|
| virtual ~UserMetricsRecorder();
|
|
|
| // Records an Ash owned user action.
|
| - void RecordUserMetricsAction(ash::UserMetricsAction action);
|
| - void RecordUserMetricsAction(wm::WmUserMetricsAction action);
|
| + void RecordUserMetricsAction(UserMetricsAction action);
|
|
|
| TaskSwitchMetricsRecorder& task_switch_metrics_recorder() {
|
| return task_switch_metrics_recorder_;
|
|
|