mash: Replace int ShelfIDs with AppLaunchID strings.

ash/public/interfaces/shelf.mojom

 // Copyright 2016 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.
 
 module ash.mojom;
 
 import "mojo/common/string16.mojom";
 import "skia/public/interfaces/bitmap.mojom";
 import "ui/events/mojo/event.mojom";
 
@@ skipping 97 matching lines @@
   Type type;                         // The type of the menu item.
   uint32 command_id;                 // The client's arbitrary item command id.
   mojo.common.mojom.String16 label;  // The string label, may be empty.
   skia.mojom.Bitmap image;           // The image icon, may be null.
   array<MenuItem>? submenu;          // The optional nested submenu item list.
   bool enabled;                      // The enabled state.
   bool checked;                      // The checked state.
   uint32 radio_group_id;             // The radio group id.
 };
 
+// Identifier for shelf items and their windows.
+// This structure matches ash::ShelfID.
+struct ShelfID {
+  string app_id;            // An app id string, used to match app windows.
+                            // (eg. extension ids, arc ids, "AppList", etc.)
+  string launch_id;         // A string used to support multiple items per app.
+                            // (eg. Citrix may use 'Word' or 'Excel' launch ids)
+};
+
 // ShelfItems are used to populate the shelf.
 // This structure matches ash::ShelfItem.
 struct ShelfItem {
   ShelfItemType type;       // The type of the shelf item.
   skia.mojom.Bitmap image;  // An icon image Bitmap, shown on the shelf.
-  int64 shelf_id;           // A shelf model ID used by the shelf and clients.
   ShelfItemStatus status;   // The running/closed/etc. status of the item.
-  string app_id;            // An app id string, used to match app windows.
-  string launch_id;         // A string used to support multiple items per app.
-                            // (eg. Citrix may use 'Word' or 'Excel' launch ids)
+  ShelfID shelf_id;         // The id for the shelf item and its windows.
   mojo.common.mojom.String16 title;  // The title to display for tooltips, etc.
   bool shows_tooltip;       // Whether the tooltip should be shown on hover.
   bool pinned_by_policy;    // Whether the item is pinned by policy preferences,
                             // the user cannot un-pin these items.
 };