Record user actions for Ash accelerators.

Clean up the huge switch of accelerators as well:
* Move a bunch of code into Handle helpers.
* Alphabetize the anon namespace helpers.
* Clean up the OS_CHROMEOS groupings a bit.

BUG=321695
R=jamescook@chromium.org

Review URL: https://codereview.chromium.org/78763003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238391 0039d316-1c4b-4281-b951-d872f2087c98

ash/accelerators/accelerator_commands.cc

@@ -9,6 +9,7 @@
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
+#include "content/public/browser/user_metrics.h"
 
 namespace ash {
 namespace accelerators {
@@ -25,8 +26,8 @@ bool ToggleMinimized() {
   wm::WindowState* window_state = wm::GetWindowState(window);
   if (!window_state->CanMinimize())
     return false;
-  ash::Shell::GetInstance()->delegate()->RecordUserMetricsAction(
-      ash::UMA_MINIMIZE_PER_KEY);
+  content::RecordAction(
+      content::UserMetricsAction("Accel_Toggle_Minimized"));
   window_state->Minimize();
   return true;
 }
@@ -35,6 +36,8 @@ void ToggleMaximized() {
   wm::WindowState* window_state = wm::GetActiveWindowState();
   if (!window_state)
     return;
+  content::RecordAction(
+      content::UserMetricsAction("Accel_Toggle_Maximized"));
   // Get out of fullscreen when in fullscreen mode.
   if (window_state->IsFullscreen())
     ToggleFullscreen();

ash/shell_delegate.h

@@ -68,7 +68,6 @@ enum UserMetricsAction {
   UMA_GESTURE_OVERVIEW,
   UMA_LAUNCHER_CLICK_ON_APP,
   UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON,
-  UMA_MINIMIZE_PER_KEY,
   UMA_MOUSE_DOWN,
   UMA_SHELF_ALIGNMENT_SET_BOTTOM,
   UMA_SHELF_ALIGNMENT_SET_LEFT,

chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -180,9 +180,6 @@ void ChromeShellDelegate::RecordUserMetricsAction(
           chromeos::default_pinned_apps_field_trial::APP_LAUNCHER);
 #endif
       break;
-    case ash::UMA_MINIMIZE_PER_KEY:
-      content::RecordAction(content::UserMetricsAction("Minimize_UsingKey"));
-      break;
     case ash::UMA_MOUSE_DOWN:
       content::RecordAction(content::UserMetricsAction("Mouse_Down"));
       break;