mash: Replace int ShelfIDs with AppLaunchID strings.

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_
 
 #include <cstdint>
+#include <string>

[msw, 2017/05/04 14:17:30]

self nit: removed

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

Huh?

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

Ha, sorry, I was up really late working on this and reviewing it myself. I
remove this unused include locally, but hadn't yet uploaded a revised patch set.

 
+#include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/ash_public_export.h"
 
 namespace ash {
 
 enum ShelfAlignment {
   SHELF_ALIGNMENT_BOTTOM,
   SHELF_ALIGNMENT_LEFT,
   SHELF_ALIGNMENT_RIGHT,
   // Top has never been supported.
 
@@ skipping 62 matching lines @@
   // An existing inactive window was activated.
   SHELF_ACTION_WINDOW_ACTIVATED,
 
   // The currently active window was minimized.
   SHELF_ACTION_WINDOW_MINIMIZED,
 
   // The app list launcher menu was shown.
   SHELF_ACTION_APP_LIST_SHOWN,
 };
 
-// Shelf IDs are sequential values assigned to shelf items by ShelfModel for
-// runtime use; they are not persisted across restarts of the ash environment.
-using ShelfID = uint32_t;
-const ShelfID kInvalidShelfID = 0u;
+// TODO(msw): Rename AppLaunchId to ShelfID.
+using ShelfID = AppLaunchId;
 
 // The type of a shelf item.
 enum ShelfItemType {
   // Represents a running app panel.
   TYPE_APP_PANEL,
 
   // Represents a pinned shortcut to an app, the app may be running or not.
   TYPE_PINNED_APP,
 
   // Toggles visiblity of the app list.
@@ skipping 26 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_