mash: Replace int ShelfIDs with AppLaunchID strings.

services/ui/public/interfaces/window_manager.mojom

Index: services/ui/public/interfaces/window_manager.mojom
diff --git a/services/ui/public/interfaces/window_manager.mojom b/services/ui/public/interfaces/window_manager.mojom
index a0b935cf0180008580c07422c9af75b9fba3892c..91f87baeb33b7db1b2c885573ee7029e1560da33 100644
--- a/services/ui/public/interfaces/window_manager.mojom
+++ b/services/ui/public/interfaces/window_manager.mojom
@@ -90,10 +90,6 @@ interface WindowManager {
   // The application icon; typically larger for shelf icons, etc. Type: SkBitmap
   const string kAppIcon_Property = "prop:app-icon";
 
-  // The application ID (eg. 'mojo:foo'). Maps to
-  // aura::client::client::kAppIdKey. Type: mojom::String
-  const string kAppID_Property = "prop:app-id";
-
   // Used to explicitly control whether a window appears in the most recently
   // used list of windows. Maps to aura::client::kExcludeFromMruKey. Type: bool.
   const string kExcludeFromMru_Property = "prop:exclude_from_mru";
@@ -134,6 +130,9 @@ interface WindowManager {
   // See ShadowElevation for details. Type: wm::ShadowElevation.
   const string kShadowElevation_Property = "prop:shadow-elevation";
 
+  // The shelf ID struct. Maps to ash::kShelfIDKey. Type: ash::ShelfID.
+  const string kShelfID_Property = "prop:shelf-id";
+
   // The type of item to be shown on the shelf for this window. Type: int
   // A few ash::ShelfItemType values are supported; TYPE_UNKNOWN means no item.
   const string kShelfItemType_Property = "prop:shelf-item-type";