mash: Replace int ShelfIDs with AppLaunchID strings.

ash/public/cpp/shelf_item.h

Index: ash/public/cpp/shelf_item.h
diff --git a/ash/public/cpp/shelf_item.h b/ash/public/cpp/shelf_item.h
index 4d1af4dd592f8d51167ee7d4954fdd36d7a3c4d1..49e312c184418c97855b5672c90da530104ec520 100644
--- a/ash/public/cpp/shelf_item.h
+++ b/ash/public/cpp/shelf_item.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/ash_public_export.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/strings/string16.h"
@@ -25,14 +24,11 @@ struct ASH_PUBLIC_EXPORT ShelfItem {
   // Image to display in the shelf.
   gfx::ImageSkia image;
 
-  // Assigned by the model when the item is added.
-  ShelfID id = kInvalidShelfID;

[James Cook, 2017/05/04 16:38:48]

Hooray, less duplicate data!

[msw, 2017/05/04 19:05:56]

Acknowledged.

-
   // Running status.
   ShelfItemStatus status = STATUS_CLOSED;
 
   // The application id and launch id for this shelf item.
-  AppLaunchId app_launch_id;
+  ShelfID id;
 
   // The title to display for tooltips, etc.
   base::string16 title;