Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/public/cpp/shelf_types.h

Index: ash/public/cpp/shelf_types.h
diff --git a/ash/public/cpp/shelf_types.h b/ash/public/cpp/shelf_types.h
index d63dfc8fb759a2a809df76cb959500d0d624f7d1..b8b7c30f29be65921c177b467ee2102d98b902ed 100644
--- a/ash/public/cpp/shelf_types.h
+++ b/ash/public/cpp/shelf_types.h
@@ -55,6 +55,28 @@ enum ShelfBackgroundType {
   SHELF_BACKGROUND_MAXIMIZED,
 };
 
+// Source of the launch or activation request, for tracking.
+enum ShelfLaunchSource {
+  LAUNCH_FROM_UNKNOWN,

[James Cook, 2017/02/15 00:44:40]

Can you document each of these while you're here?

[msw, 2017/02/15 19:59:18]

Done.

+  LAUNCH_FROM_APP_LIST,
+  LAUNCH_FROM_APP_LIST_SEARCH,
+};
+
+// The actions that may be performed when a shelf item is selected.
+// TODO(msw): Update kConstantValueNaming to ENUM_VALUE_NAMING.
+enum ShelfAction {
+  // No action was taken.
+  kNoAction,
+  // A new window was created.
+  kNewWindowCreated,
+  // An existing inactive window was activated.
+  kExistingWindowActivated,
+  // The currently active window was minimized.
+  kExistingWindowMinimized,
+  // The app list launcher menu was shown.
+  kAppListMenuShown,
+};
+
 typedef int ShelfID;
 const int kInvalidShelfID = 0;