Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/public/cpp/shelf_types.h

 // Copyright (c) 2012 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_PUBLIC_CPP_SHELF_TYPES_H_
 #define ASH_PUBLIC_CPP_SHELF_TYPES_H_
 
 namespace ash {
 
 enum ShelfAlignment {
@@ skipping 37 matching lines @@
   // The default transparent background.
   SHELF_BACKGROUND_DEFAULT,
 
   // The background when a window is overlapping.
   SHELF_BACKGROUND_OVERLAP,
 
   // The background when a window is maximized.
   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;
 
 // The type of a shelf item.
 enum ShelfItemType {
   // Represents a running app panel.
   TYPE_APP_PANEL,
 
   // Represents a pinned shortcut to an app.
   TYPE_APP_SHORTCUT,
@@ skipping 24 matching lines @@
   STATUS_RUNNING,
   // An active shelf item that has focus.
   STATUS_ACTIVE,
   // A shelf item that needs user's attention.
   STATUS_ATTENTION,
 };
 
 }  // namespace ash
 
 #endif  // ASH_PUBLIC_CPP_SHELF_TYPES_H_