Added UMA metrics for display settings UI in the status area.

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 181 matching lines @@
 UserMetricsRecorder::UserMetricsRecorder(bool record_periodic_metrics) {
   if (record_periodic_metrics)
     StartTimer();
 }
 
 UserMetricsRecorder::~UserMetricsRecorder() {
   timer_.Stop();
 }
 
 void UserMetricsRecorder::RecordUserMetricsAction(UserMetricsAction action) {
+  // UserMetricsActions must be on the same line as the string literal. This

[tdanderson, 2016/07/08 18:37:50]

nit: UserMetricsAction -> UserMetricsAction

nit: give a super-brief explanation why they must be on the same line

[bruthig, 2016/07/08 21:11:17]

Turns out the string literal doesn't need to be on the same line and the
documentation is out of date.  I will leave the using statements because it
improves the readability however.

+  // reduces the column count per line and allows for longer string literals.

[James Cook, 2016/07/08 17:50:19]

I don't think this comment is correct, and I would remove it.

The regex eats newlines:
https://cs-staging.chromium.org/chromium/src/tools/metrics/actions/extract_ac...

And there are tests for metrics that span multiple lines:
https://cs-staging.chromium.org/chromium/src/tools/metrics/actions/extract_ac...

[bruthig, 2016/07/08 21:11:17]

Confirmed with rkaplow@ as well.  Done.

+  using UserMetricsAction = base::UserMetricsAction;

[James Cook, 2016/07/08 17:50:19]

optional nit: I think just "using base::UserMetricsAction" is fine, and is what
other code does.

I'm glad that you did this, btw. It makes the code much easier to read.

[bruthig, 2016/07/08 21:11:17]

Done.

Also added using base::RecordAction;

+
   switch (action) {
     case UMA_ACCEL_KEYBOARD_BRIGHTNESS_DOWN_F6:
-      base::RecordAction(
-          base::UserMetricsAction("Accel_KeyboardBrightnessDown_F6"));
+      base::RecordAction(UserMetricsAction("Accel_KeyboardBrightnessDown_F6"));
       break;
     case UMA_ACCEL_KEYBOARD_BRIGHTNESS_UP_F7:
-      base::RecordAction(
-          base::UserMetricsAction("Accel_KeyboardBrightnessUp_F7"));
+      base::RecordAction(UserMetricsAction("Accel_KeyboardBrightnessUp_F7"));
       break;
     case UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON:
-      base::RecordAction(
-          base::UserMetricsAction("Accel_LockScreen_LockButton"));
+      base::RecordAction(UserMetricsAction("Accel_LockScreen_LockButton"));
       break;
     case UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON:
-      base::RecordAction(
-          base::UserMetricsAction("Accel_LockScreen_PowerButton"));
+      base::RecordAction(UserMetricsAction("Accel_LockScreen_PowerButton"));
       break;
     case UMA_ACCEL_MAXIMIZE_RESTORE_F4:
-      base::RecordAction(base::UserMetricsAction("Accel_Maximize_Restore_F4"));
+      base::RecordAction(UserMetricsAction("Accel_Maximize_Restore_F4"));
       break;
     case UMA_ACCEL_PREVWINDOW_F5:
-      base::RecordAction(base::UserMetricsAction("Accel_PrevWindow_F5"));
+      base::RecordAction(UserMetricsAction("Accel_PrevWindow_F5"));
       break;
     case UMA_ACCEL_EXIT_FIRST_Q:
-      base::RecordAction(base::UserMetricsAction("Accel_Exit_First_Q"));
+      base::RecordAction(UserMetricsAction("Accel_Exit_First_Q"));
       break;
     case UMA_ACCEL_EXIT_SECOND_Q:
-      base::RecordAction(base::UserMetricsAction("Accel_Exit_Second_Q"));
+      base::RecordAction(UserMetricsAction("Accel_Exit_Second_Q"));
       break;
     case UMA_ACCEL_RESTART_POWER_BUTTON:
-      base::RecordAction(base::UserMetricsAction("Accel_Restart_PowerButton"));
+      base::RecordAction(UserMetricsAction("Accel_Restart_PowerButton"));
       break;
     case UMA_ACCEL_SHUT_DOWN_POWER_BUTTON:
-      base::RecordAction(base::UserMetricsAction("Accel_ShutDown_PowerButton"));
+      base::RecordAction(UserMetricsAction("Accel_ShutDown_PowerButton"));
       break;
     case UMA_CLOSE_THROUGH_CONTEXT_MENU:
-      base::RecordAction(base::UserMetricsAction("CloseFromContextMenu"));
+      base::RecordAction(UserMetricsAction("CloseFromContextMenu"));
       break;
     case UMA_DESKTOP_SWITCH_TASK:
-      base::RecordAction(base::UserMetricsAction("Desktop_SwitchTask"));
+      base::RecordAction(UserMetricsAction("Desktop_SwitchTask"));
       task_switch_metrics_recorder_.OnTaskSwitch(
           TaskSwitchMetricsRecorder::DESKTOP);
       break;
     case UMA_DRAG_MAXIMIZE_LEFT:
-      base::RecordAction(base::UserMetricsAction("WindowDrag_MaximizeLeft"));
+      base::RecordAction(UserMetricsAction("WindowDrag_MaximizeLeft"));
       break;
     case UMA_DRAG_MAXIMIZE_RIGHT:
-      base::RecordAction(base::UserMetricsAction("WindowDrag_MaximizeRight"));
+      base::RecordAction(UserMetricsAction("WindowDrag_MaximizeRight"));
       break;
     case UMA_LAUNCHER_BUTTON_PRESSED_WITH_MOUSE:
-      base::RecordAction(
-          base::UserMetricsAction("Launcher_ButtonPressed_Mouse"));
+      base::RecordAction(UserMetricsAction("Launcher_ButtonPressed_Mouse"));
       break;
     case UMA_LAUNCHER_BUTTON_PRESSED_WITH_TOUCH:
-      base::RecordAction(
-          base::UserMetricsAction("Launcher_ButtonPressed_Touch"));
+      base::RecordAction(UserMetricsAction("Launcher_ButtonPressed_Touch"));
       break;
     case UMA_LAUNCHER_CLICK_ON_APP:
-      base::RecordAction(base::UserMetricsAction("Launcher_ClickOnApp"));
+      base::RecordAction(UserMetricsAction("Launcher_ClickOnApp"));
       break;
     case UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON:
-      base::RecordAction(
-          base::UserMetricsAction("Launcher_ClickOnApplistButton"));
+      base::RecordAction(UserMetricsAction("Launcher_ClickOnApplistButton"));
       break;
     case UMA_LAUNCHER_LAUNCH_TASK:
-      base::RecordAction(base::UserMetricsAction("Launcher_LaunchTask"));
+      base::RecordAction(UserMetricsAction("Launcher_LaunchTask"));
       task_switch_metrics_recorder_.OnTaskSwitch(
           TaskSwitchMetricsRecorder::SHELF);
       break;
     case UMA_LAUNCHER_MINIMIZE_TASK:
-      base::RecordAction(base::UserMetricsAction("Launcher_MinimizeTask"));
+      base::RecordAction(UserMetricsAction("Launcher_MinimizeTask"));
       break;
     case UMA_LAUNCHER_SWITCH_TASK:
-      base::RecordAction(base::UserMetricsAction("Launcher_SwitchTask"));
+      base::RecordAction(UserMetricsAction("Launcher_SwitchTask"));
       task_switch_metrics_recorder_.OnTaskSwitch(
           TaskSwitchMetricsRecorder::SHELF);
       break;
     case UMA_MAXIMIZE_MODE_DISABLED:
-      base::RecordAction(base::UserMetricsAction("Touchview_Disabled"));
+      base::RecordAction(UserMetricsAction("Touchview_Disabled"));
       break;
     case UMA_MAXIMIZE_MODE_ENABLED:
-      base::RecordAction(base::UserMetricsAction("Touchview_Enabled"));
+      base::RecordAction(UserMetricsAction("Touchview_Enabled"));
       break;
     case UMA_MAXIMIZE_MODE_INITIALLY_DISABLED:
-      base::RecordAction(
-          base::UserMetricsAction("Touchview_Initially_Disabled"));
+      base::RecordAction(UserMetricsAction("Touchview_Initially_Disabled"));
       break;
     case UMA_MOUSE_DOWN:
-      base::RecordAction(base::UserMetricsAction("Mouse_Down"));
+      base::RecordAction(UserMetricsAction("Mouse_Down"));
       break;
     case UMA_PANEL_MINIMIZE_CAPTION_CLICK:
-      base::RecordAction(
-          base::UserMetricsAction("Panel_Minimize_Caption_Click"));
+      base::RecordAction(UserMetricsAction("Panel_Minimize_Caption_Click"));
       break;
     case UMA_PANEL_MINIMIZE_CAPTION_GESTURE:
-      base::RecordAction(
-          base::UserMetricsAction("Panel_Minimize_Caption_Gesture"));
+      base::RecordAction(UserMetricsAction("Panel_Minimize_Caption_Gesture"));
       break;
     case UMA_SHELF_ALIGNMENT_SET_BOTTOM:
-      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetBottom"));
+      base::RecordAction(UserMetricsAction("Shelf_AlignmentSetBottom"));
       break;
     case UMA_SHELF_ALIGNMENT_SET_LEFT:
-      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetLeft"));
+      base::RecordAction(UserMetricsAction("Shelf_AlignmentSetLeft"));
       break;
     case UMA_SHELF_ALIGNMENT_SET_RIGHT:
-      base::RecordAction(base::UserMetricsAction("Shelf_AlignmentSetRight"));
+      base::RecordAction(UserMetricsAction("Shelf_AlignmentSetRight"));
       break;
     case UMA_STATUS_AREA_AUDIO_CURRENT_INPUT_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Audio_CurrentInputDevice"));
+          UserMetricsAction("StatusArea_Audio_CurrentInputDevice"));
       break;
     case UMA_STATUS_AREA_AUDIO_CURRENT_OUTPUT_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Audio_CurrentOutputDevice"));
+          UserMetricsAction("StatusArea_Audio_CurrentOutputDevice"));
       break;
     case UMA_STATUS_AREA_AUDIO_SWITCH_INPUT_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Audio_SwitchInputDevice"));
+          UserMetricsAction("StatusArea_Audio_SwitchInputDevice"));
       break;
     case UMA_STATUS_AREA_AUDIO_SWITCH_OUTPUT_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Audio_SwitchOutputDevice"));
+          UserMetricsAction("StatusArea_Audio_SwitchOutputDevice"));
       break;
     case UMA_STATUS_AREA_BRIGHTNESS_CHANGED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_BrightnessChanged"));
+      base::RecordAction(UserMetricsAction("StatusArea_BrightnessChanged"));
       break;
     case UMA_STATUS_AREA_BLUETOOTH_CONNECT_KNOWN_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Bluetooth_Connect_Known"));
+          UserMetricsAction("StatusArea_Bluetooth_Connect_Known"));
       break;
     case UMA_STATUS_AREA_BLUETOOTH_CONNECT_UNKNOWN_DEVICE:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Bluetooth_Connect_Unknown"));
+          UserMetricsAction("StatusArea_Bluetooth_Connect_Unknown"));
       break;
     case UMA_STATUS_AREA_BLUETOOTH_DISABLED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Bluetooth_Disabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_Bluetooth_Disabled"));
       break;
     case UMA_STATUS_AREA_BLUETOOTH_ENABLED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Bluetooth_Enabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_Bluetooth_Enabled"));
       break;
     case UMA_STATUS_AREA_CAPS_LOCK_DETAILED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_CapsLock_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_CapsLock_Detailed"));
       break;
     case UMA_STATUS_AREA_CAPS_LOCK_DISABLED_BY_CLICK:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_CapsLock_DisabledByClick"));
+          UserMetricsAction("StatusArea_CapsLock_DisabledByClick"));
       break;
     case UMA_STATUS_AREA_CAPS_LOCK_ENABLED_BY_CLICK:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_CapsLock_EnabledByClick"));
+          UserMetricsAction("StatusArea_CapsLock_EnabledByClick"));
       break;
     case UMA_STATUS_AREA_CAPS_LOCK_POPUP:
-      base::RecordAction(base::UserMetricsAction("StatusArea_CapsLock_Popup"));
+      base::RecordAction(UserMetricsAction("StatusArea_CapsLock_Popup"));
       break;
     case UMA_STATUS_AREA_CAST_STOP_CAST:
-      base::RecordAction(base::UserMetricsAction("StatusArea_Cast_StopCast"));
+      base::RecordAction(UserMetricsAction("StatusArea_Cast_StopCast"));
       break;
     case UMA_STATUS_AREA_CONNECT_TO_CONFIGURED_NETWORK:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_ConnectConfigured"));
+          UserMetricsAction("StatusArea_Network_ConnectConfigured"));
       break;
     case UMA_STATUS_AREA_CONNECT_TO_UNCONFIGURED_NETWORK:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_ConnectUnconfigured"));
+          UserMetricsAction("StatusArea_Network_ConnectUnconfigured"));
       break;
     case UMA_STATUS_AREA_CONNECT_TO_VPN:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_VPN_ConnectToNetwork"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_ConnectToNetwork"));
       break;
     case UMA_STATUS_AREA_CHANGED_VOLUME_MENU:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Volume_ChangedMenu"));
+      base::RecordAction(UserMetricsAction("StatusArea_Volume_ChangedMenu"));
       break;
     case UMA_STATUS_AREA_CHANGED_VOLUME_POPUP:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Volume_ChangedPopup"));
+      base::RecordAction(UserMetricsAction("StatusArea_Volume_ChangedPopup"));
       break;
     case UMA_STATUS_AREA_DETAILED_ACCESSABILITY:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Accessability_DetailedView"));
+          UserMetricsAction("StatusArea_Accessability_DetailedView"));
       break;
     case UMA_STATUS_AREA_DETAILED_AUDIO_VIEW:
-      base::RecordAction(base::UserMetricsAction("StatusArea_Audio_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Audio_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_BLUETOOTH_VIEW:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Bluetooth_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Bluetooth_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Brightness_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Brightness_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_CAST_VIEW:
-      base::RecordAction(base::UserMetricsAction("StatusArea_Cast_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Cast_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Cast_Detailed_Launch_Cast"));
+          UserMetricsAction("StatusArea_Cast_Detailed_Launch_Cast"));
       break;
     case UMA_STATUS_AREA_DETAILED_DRIVE_VIEW:
-      base::RecordAction(base::UserMetricsAction("StatusArea_Drive_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Drive_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_NETWORK_VIEW:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_Network_Detailed"));
       break;
     case UMA_STATUS_AREA_DETAILED_VPN_VIEW:
-      base::RecordAction(base::UserMetricsAction("StatusArea_VPN_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_Detailed"));
       break;
     case UMA_STATUS_AREA_DISABLE_AUTO_CLICK:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_AutoClickDisabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_AutoClickDisabled"));
       break;
     case UMA_STATUS_AREA_DISABLE_HIGH_CONTRAST:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_HighContrastDisabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_HighContrastDisabled"));
       break;
     case UMA_STATUS_AREA_DISABLE_LARGE_CURSOR:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_LargeCursorDisabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_LargeCursorDisabled"));
       break;
     case UMA_STATUS_AREA_DISABLE_MAGNIFIER:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_MagnifierDisabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_MagnifierDisabled"));
       break;
     case UMA_STATUS_AREA_DISABLE_SPOKEN_FEEDBACK:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_SpokenFeedbackDisabled"));
+          UserMetricsAction("StatusArea_SpokenFeedbackDisabled"));
       break;
     case UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_VirtualKeyboardDisabled"));
+          UserMetricsAction("StatusArea_VirtualKeyboardDisabled"));
+      break;
+    case UMA_STATUS_AREA_DISPLAY_DEFAULT_SELECTED:
+      base::RecordAction(
+          UserMetricsAction("StatusArea_Display_Default_Selected"));
+      break;
+    case UMA_STATUS_AREA_DISPLAY_DEFAULT_SHOW_SETTINGS:
+      base::RecordAction(
+          UserMetricsAction("StatusArea_Display_Default_ShowSettings"));
+      break;
+    case UMA_STATUS_AREA_DISPLAY_NOTIFICATION_CREATED:
+      base::RecordAction(
+          UserMetricsAction("StatusArea_Display_Notification_Created"));
+      break;
+    case UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SELECTED:
+      base::RecordAction(
+          UserMetricsAction("StatusArea_Display_Notification_Selected"));
+      break;
+    case UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SHOW_SETTINGS:
+      base::RecordAction(
+          UserMetricsAction("StatusArea_Display_Notification_Show_Settings"));
       break;
     case UMA_STATUS_AREA_DISABLE_WIFI:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_WifiDisabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_Network_WifiDisabled"));
       break;
     case UMA_STATUS_AREA_DRIVE_CANCEL_OPERATION:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Drive_CancelOperation"));
+      base::RecordAction(UserMetricsAction("StatusArea_Drive_CancelOperation"));
       break;
     case UMA_STATUS_AREA_DRIVE_SETTINGS:
-      base::RecordAction(base::UserMetricsAction("StatusArea_Drive_Settings"));
+      base::RecordAction(UserMetricsAction("StatusArea_Drive_Settings"));
       break;
     case UMA_STATUS_AREA_ENABLE_AUTO_CLICK:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_AutoClickEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_AutoClickEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_HIGH_CONTRAST:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_HighContrastEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_HighContrastEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_LARGE_CURSOR:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_LargeCursorEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_LargeCursorEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_MAGNIFIER:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_MagnifierEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_MagnifierEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_SPOKEN_FEEDBACK:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_SpokenFeedbackEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_SpokenFeedbackEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_VirtualKeyboardEnabled"));
+          UserMetricsAction("StatusArea_VirtualKeyboardEnabled"));
       break;
     case UMA_STATUS_AREA_ENABLE_WIFI:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_WifiEnabled"));
+      base::RecordAction(UserMetricsAction("StatusArea_Network_WifiEnabled"));
       break;
     case UMA_STATUS_AREA_IME_SHOW_DETAILED:
-      base::RecordAction(base::UserMetricsAction("StatusArea_IME_Detailed"));
+      base::RecordAction(UserMetricsAction("StatusArea_IME_Detailed"));
       break;
     case UMA_STATUS_AREA_IME_SWITCH_MODE:
-      base::RecordAction(base::UserMetricsAction("StatusArea_IME_SwitchMode"));
+      base::RecordAction(UserMetricsAction("StatusArea_IME_SwitchMode"));
       break;
     case UMA_STATUS_AREA_MENU_OPENED:
-      base::RecordAction(base::UserMetricsAction("StatusArea_MenuOpened"));
+      base::RecordAction(UserMetricsAction("StatusArea_MenuOpened"));
       break;
     case UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_JoinOther"));
+      base::RecordAction(UserMetricsAction("StatusArea_Network_JoinOther"));
       break;
     case UMA_STATUS_AREA_NETWORK_SETTINGS_CLICKED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_Settings"));
+      base::RecordAction(UserMetricsAction("StatusArea_Network_Settings"));
       break;
     case UMA_STATUS_AREA_SHOW_NETWORK_CONNECTION_DETAILS:
       base::RecordAction(
-          base::UserMetricsAction("StatusArea_Network_ConnectionDetails"));
+          UserMetricsAction("StatusArea_Network_ConnectionDetails"));
       break;
     case UMA_STATUS_AREA_SHOW_VPN_CONNECTION_DETAILS:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_VPN_ConnectionDetails"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_ConnectionDetails"));
       break;
     case UMA_STATUS_AREA_SIGN_OUT:
-      base::RecordAction(base::UserMetricsAction("StatusArea_SignOut"));
+      base::RecordAction(UserMetricsAction("StatusArea_SignOut"));
       break;
     case UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED:
-      base::RecordAction(base::UserMetricsAction("StatusArea_VPN_AddBuiltIn"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_AddBuiltIn"));
       break;
     case UMA_STATUS_AREA_VPN_ADD_THIRD_PARTY_CLICKED:
-      base::RecordAction(
-          base::UserMetricsAction("StatusArea_VPN_AddThirdParty"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_AddThirdParty"));
       break;
     case UMA_STATUS_AREA_VPN_DISCONNECT_CLICKED:
-      base::RecordAction(base::UserMetricsAction("StatusArea_VPN_Disconnect"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_Disconnect"));
       break;
     case UMA_STATUS_AREA_VPN_SETTINGS_CLICKED:
-      base::RecordAction(base::UserMetricsAction("StatusArea_VPN_Settings"));
+      base::RecordAction(UserMetricsAction("StatusArea_VPN_Settings"));
       break;
     case UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK:
-      base::RecordAction(
-          base::UserMetricsAction("Caption_ClickTogglesMaximize"));
+      base::RecordAction(UserMetricsAction("Caption_ClickTogglesMaximize"));
       break;
     case UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE:
-      base::RecordAction(
-          base::UserMetricsAction("Caption_GestureTogglesMaximize"));
+      base::RecordAction(UserMetricsAction("Caption_GestureTogglesMaximize"));
       break;
     case UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK:
-      base::RecordAction(base::UserMetricsAction(
-          "WindowBorder_ClickTogglesSingleAxisMaximize"));
+      base::RecordAction(
+          UserMetricsAction("WindowBorder_ClickTogglesSingleAxisMaximize"));
       break;
     case UMA_TOUCHPAD_GESTURE_OVERVIEW:
-      base::RecordAction(base::UserMetricsAction("Touchpad_Gesture_Overview"));
+      base::RecordAction(UserMetricsAction("Touchpad_Gesture_Overview"));
       break;
     case UMA_TOUCHSCREEN_TAP_DOWN:
-      base::RecordAction(base::UserMetricsAction("Touchscreen_Down"));
+      base::RecordAction(UserMetricsAction("Touchscreen_Down"));
       break;
     case UMA_TRAY_HELP:
-      base::RecordAction(base::UserMetricsAction("Tray_Help"));
+      base::RecordAction(UserMetricsAction("Tray_Help"));
       break;
     case UMA_TRAY_LOCK_SCREEN:
-      base::RecordAction(base::UserMetricsAction("Tray_LockScreen"));
+      base::RecordAction(UserMetricsAction("Tray_LockScreen"));
       break;
     case UMA_TRAY_OVERVIEW:
-      base::RecordAction(base::UserMetricsAction("Tray_Overview"));
+      base::RecordAction(UserMetricsAction("Tray_Overview"));
       break;
     case UMA_TRAY_SHUT_DOWN:
-      base::RecordAction(base::UserMetricsAction("Tray_ShutDown"));
+      base::RecordAction(UserMetricsAction("Tray_ShutDown"));
       break;
     case UMA_WINDOW_APP_CLOSE_BUTTON_CLICK:
-      base::RecordAction(base::UserMetricsAction("AppCloseButton_Clk"));
+      base::RecordAction(UserMetricsAction("AppCloseButton_Clk"));
       break;
     case UMA_WINDOW_CLOSE_BUTTON_CLICK:
-      base::RecordAction(base::UserMetricsAction("CloseButton_Clk"));
+      base::RecordAction(UserMetricsAction("CloseButton_Clk"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN:
-      base::RecordAction(base::UserMetricsAction("MaxButton_Clk_ExitFS"));
+      base::RecordAction(UserMetricsAction("MaxButton_Clk_ExitFS"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE:
-      base::RecordAction(base::UserMetricsAction("MaxButton_Clk_Restore"));
+      base::RecordAction(UserMetricsAction("MaxButton_Clk_Restore"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE:
-      base::RecordAction(base::UserMetricsAction("MaxButton_Clk_Maximize"));
+      base::RecordAction(UserMetricsAction("MaxButton_Clk_Maximize"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MINIMIZE:
-      base::RecordAction(base::UserMetricsAction("MinButton_Clk"));
+      base::RecordAction(UserMetricsAction("MinButton_Clk"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT:
-      base::RecordAction(base::UserMetricsAction("MaxButton_MaxLeft"));
+      base::RecordAction(UserMetricsAction("MaxButton_MaxLeft"));
       break;
     case UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT:
-      base::RecordAction(base::UserMetricsAction("MaxButton_MaxRight"));
+      base::RecordAction(UserMetricsAction("MaxButton_MaxRight"));
       break;
     case UMA_WINDOW_CYCLE:
-      base::RecordAction(
-          base::UserMetricsAction("WindowCycleController_Cycle"));
+      base::RecordAction(UserMetricsAction("WindowCycleController_Cycle"));
       break;
     case UMA_WINDOW_OVERVIEW:
-      base::RecordAction(base::UserMetricsAction("WindowSelector_Overview"));
+      base::RecordAction(UserMetricsAction("WindowSelector_Overview"));
       break;
     case UMA_WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED:
       base::RecordAction(
-          base::UserMetricsAction("WindowSelector_ActiveWindowChanged"));
+          UserMetricsAction("WindowSelector_ActiveWindowChanged"));
       task_switch_metrics_recorder_.OnTaskSwitch(
           TaskSwitchMetricsRecorder::OVERVIEW_MODE);
       break;
     case UMA_WINDOW_OVERVIEW_ENTER_KEY:
-      base::RecordAction(
-          base::UserMetricsAction("WindowSelector_OverviewEnterKey"));
+      base::RecordAction(UserMetricsAction("WindowSelector_OverviewEnterKey"));
       break;
   }
 }
 
 void UserMetricsRecorder::OnShellInitialized() {
   // Lazy creation of the DesktopTaskSwitchMetricRecorder because it accesses
   // Shell::GetInstance() which is not available when |this| is instantiated.
   if (!desktop_task_switch_metric_recorder_) {
     desktop_task_switch_metric_recorder_.reset(
         new DesktopTaskSwitchMetricRecorder());
@@ skipping 37 matching lines @@
   return IsUserActive() && !IsKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this, &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 }  // namespace ash