Combine shelf platform and windowed app types.

ash/common/shelf/shelf_item_types.h

Index: ash/common/shelf/shelf_item_types.h
diff --git a/ash/common/shelf/shelf_item_types.h b/ash/common/shelf/shelf_item_types.h
index c09a06433649dd44bea3f47b2d39fa74e8b01551..2f05e8c5f60be906eb70d0da6a978ae0f486225d 100644
--- a/ash/common/shelf/shelf_item_types.h
+++ b/ash/common/shelf/shelf_item_types.h
@@ -30,11 +30,8 @@ enum ShelfItemType {
   // The browser shortcut button.
   TYPE_BROWSER_SHORTCUT,
 
-  // Represents a platform app.
-  TYPE_PLATFORM_APP,
-
-  // Represents a windowed V1 browser app.
-  TYPE_WINDOWED_APP,
+  // Represents an app (platform/V2 or windowed V1 browser).

[James Cook, 2016/11/28 22:57:47]

Can you clarify the various sorts of apps in this comment? Like, is "packaged"
one of them? And aren't there 3 types?

[msw, 2016/11/28 23:47:41]

I don't feel highly experienced here, but I tried to enumerate the app types...
Really, the shelf should be agnostic to app types, so I'm not sure how useful
this list is here. Lmk what you think.

+  TYPE_APP,
 
   // Represents a dialog.
   TYPE_DIALOG,