Combine shelf platform and windowed app types.

chrome/browser/ui/ash/launcher/launcher_item_controller.cc

Index: chrome/browser/ui/ash/launcher/launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
index dde85b71c4631942901cd64673acc2968f8261d8..53605f7155237efc7cf73848dfdfa3495c41076b 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
@@ -28,10 +28,9 @@ ash::ShelfItemType LauncherItemController::GetShelfItemType() const {
 
   switch (type_) {
     case LauncherItemController::TYPE_SHORTCUT:
-    case LauncherItemController::TYPE_WINDOWED_APP:
       return ash::TYPE_APP_SHORTCUT;
     case LauncherItemController::TYPE_APP:
-      return ash::TYPE_PLATFORM_APP;
+      return ash::TYPE_APP;
     case LauncherItemController::TYPE_APP_PANEL:
       return ash::TYPE_APP_PANEL;
   }