Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/shelf_button_pressed_metric_tracker.h

Index: ash/common/shelf/shelf_button_pressed_metric_tracker.h
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker.h b/ash/common/shelf/shelf_button_pressed_metric_tracker.h
index 0b8accd0f70fb4b49c311df46b0642d879254e38..5cf199118f2d24626aa0185a8210c66139eb5f2b 100644
--- a/ash/common/shelf/shelf_button_pressed_metric_tracker.h
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker.h
@@ -47,7 +47,7 @@ class ASH_EXPORT ShelfButtonPressedMetricTracker {
   // Records metrics based on the |event|, |sender|, and |performed_action|.
   void ButtonPressed(const ui::Event& event,
                      const views::Button* sender,
-                     ShelfItemDelegate::PerformedAction performed_action);
+                     ShelfAction performed_action);
 
  private:
   friend class test::ShelfButtonPressedMetricTrackerTestAPI;
@@ -56,8 +56,7 @@ class ASH_EXPORT ShelfButtonPressedMetricTracker {
   void RecordButtonPressedSource(const ui::Event& event);
 
   // Records UMA metrics for the action performed when a button is pressed.
-  void RecordButtonPressedAction(
-      ShelfItemDelegate::PerformedAction performed_action);
+  void RecordButtonPressedAction(ShelfAction performed_action);
 
   // Records UMA metrics for the elapsed time since the last window minimize
   // action.