Don't allow windowed but not pinned applications to mix with shortcuts in the shelf launcher

ash/shelf/shelf_model.cc

Index: ash/shelf/shelf_model.cc
diff --git a/ash/shelf/shelf_model.cc b/ash/shelf/shelf_model.cc
index 8f4f10fe8b031fe0f3e60504e8dc64e05ba43de7..1ca0d9a604847940c05819754b03add4e783ff02 100644
--- a/ash/shelf/shelf_model.cc
+++ b/ash/shelf/shelf_model.cc
@@ -22,8 +22,8 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
         return 0;
       case TYPE_BROWSER_SHORTCUT:
       case TYPE_APP_SHORTCUT:
-      case TYPE_WINDOWED_APP:
         return 1;
+      case TYPE_WINDOWED_APP:
       case TYPE_PLATFORM_APP:
         return 2;
       case TYPE_DIALOG:
@@ -38,8 +38,8 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
     switch (type) {
       case TYPE_BROWSER_SHORTCUT:
       case TYPE_APP_SHORTCUT:
-      case TYPE_WINDOWED_APP:
         return 0;
+      case TYPE_WINDOWED_APP:
       case TYPE_PLATFORM_APP:
         return 1;
       case TYPE_APP_LIST: