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

ash/shelf/shelf_model.cc

 // Copyright 2013 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.
 
 #include "ash/shelf/shelf_model.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int LauncherItemTypeToWeight(LauncherItemType type) {
   if (ash::switches::UseAlternateShelfLayout()) {
     switch (type) {
       case TYPE_APP_LIST:
         // TODO(skuhne): If the app list item becomes movable again, this need
         // to be a fallthrough.
         return 0;
       case TYPE_BROWSER_SHORTCUT:
       case TYPE_APP_SHORTCUT:
+        return 1;
       case TYPE_WINDOWED_APP:
-        return 1;
       case TYPE_PLATFORM_APP:
         return 2;
       case TYPE_DIALOG:
         return 3;
       case TYPE_APP_PANEL:
         return 4;
       case TYPE_UNDEFINED:
         NOTREACHED() << "LauncherItemType must be set";
         return -1;
     }
   } else {
     switch (type) {
       case TYPE_BROWSER_SHORTCUT:
       case TYPE_APP_SHORTCUT:
+        return 0;
       case TYPE_WINDOWED_APP:
-        return 0;
       case TYPE_PLATFORM_APP:
         return 1;
       case TYPE_APP_LIST:
         return 2;
       case TYPE_DIALOG:
         return 3;
       case TYPE_APP_PANEL:
         return 4;
       case TYPE_UNDEFINED:
         NOTREACHED() << "LauncherItemType must be set";
@@ skipping 133 matching lines @@
                                     CompareByWeight) - items_.begin(),
                    static_cast<LauncherItems::difference_type>(index));
   index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<LauncherItems::difference_type>(index));
 
   return index;
 }
 
 }  // namespace ash