Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/shelf_button_pressed_metric_tracker.h

 // Copyright 2015 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.
 
 #ifndef ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
 #define ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 29 matching lines @@
  public:
   static const char
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName[];
 
   ShelfButtonPressedMetricTracker();
   ~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;
 
   // Records UMA metrics for the input source when a button is pressed.
   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.
   void RecordTimeBetweenMinimizedAndActivated();
 
   // Returns true if a window activation action triggered by |sender| would
   // be subsequent to the last minimize window action.
   bool IsSubsequentActivationEvent(const views::Button* sender) const;
 
   // Caches state data for a window minimized action. The |sender| is the button
@@ skipping 12 matching lines @@
   // Stores the source button of the last window minimize action.
   // NOTE: This may become stale and should not be operated on. Not owned.
   const views::Button* last_minimized_source_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfButtonPressedMetricTracker);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_