Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/shelf_button_pressed_metric_tracker.cc

Index: ash/common/shelf/shelf_button_pressed_metric_tracker.cc
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker.cc b/ash/common/shelf/shelf_button_pressed_metric_tracker.cc
index c7a9956c95bd3af6515ef85d88a2c9cff7f54e93..82ab131f6564bd443a8f3f3772b63fdfb28e6276 100644
--- a/ash/common/shelf/shelf_button_pressed_metric_tracker.cc
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker.cc
@@ -25,15 +25,15 @@ ShelfButtonPressedMetricTracker::~ShelfButtonPressedMetricTracker() {}
 void ShelfButtonPressedMetricTracker::ButtonPressed(
     const ui::Event& event,
     const views::Button* sender,
-    ShelfItemDelegate::PerformedAction performed_action) {
+    ShelfAction performed_action) {
   RecordButtonPressedSource(event);
   RecordButtonPressedAction(performed_action);
 
   switch (performed_action) {
-    case ShelfItemDelegate::kExistingWindowMinimized:
+    case kExistingWindowMinimized:
       SetMinimizedData(sender);
       break;
-    case ShelfItemDelegate::kExistingWindowActivated:
+    case kExistingWindowActivated:
       if (IsSubsequentActivationEvent(sender))
         RecordTimeBetweenMinimizedAndActivated();
       break;
@@ -41,7 +41,7 @@ void ShelfButtonPressedMetricTracker::ButtonPressed(
       break;
   }
 
-  if (performed_action != ShelfItemDelegate::kExistingWindowMinimized)
+  if (performed_action != kExistingWindowMinimized)
     ResetMinimizedData();
 }
 
@@ -57,18 +57,18 @@ void ShelfButtonPressedMetricTracker::RecordButtonPressedSource(
 }
 
 void ShelfButtonPressedMetricTracker::RecordButtonPressedAction(
-    ShelfItemDelegate::PerformedAction performed_action) {
+    ShelfAction performed_action) {
   switch (performed_action) {
-    case ShelfItemDelegate::kNoAction:
-    case ShelfItemDelegate::kAppListMenuShown:
+    case kNoAction:
+    case kAppListMenuShown:
       break;
-    case ShelfItemDelegate::kNewWindowCreated:
+    case kNewWindowCreated:
       WmShell::Get()->RecordUserMetricsAction(UMA_LAUNCHER_LAUNCH_TASK);
       break;
-    case ShelfItemDelegate::kExistingWindowActivated:
+    case kExistingWindowActivated:
       WmShell::Get()->RecordUserMetricsAction(UMA_LAUNCHER_SWITCH_TASK);
       break;
-    case ShelfItemDelegate::kExistingWindowMinimized:
+    case kExistingWindowMinimized:
       WmShell::Get()->RecordUserMetricsAction(UMA_LAUNCHER_MINIMIZE_TASK);
       break;
   }