Combine shelf platform and windowed app types.

ash/common/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/common/shelf/shelf_model.h"
 
 #include <algorithm>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int ShelfItemTypeToWeight(ShelfItemType type) {
   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:
-    case TYPE_PLATFORM_APP:
+    case TYPE_APP:
       return 2;
     case TYPE_DIALOG:
       return 3;
     case TYPE_APP_PANEL:
       return 4;
     case TYPE_IME_MENU:
       return 5;
     case TYPE_UNDEFINED:
       NOTREACHED() << "ShelfItemType must be set";
       return -1;
@@ skipping 97 matching lines @@
 
 ShelfItems::const_iterator ShelfModel::ItemByID(int id) const {
   for (ShelfItems::const_iterator i = items_.begin(); i != items_.end(); ++i) {
     if (i->id == id)
       return i;
   }
   return items_.end();
 }
 
 int ShelfModel::FirstRunningAppIndex() const {
-  // Since lower_bound only checks weights against each other, we do not need
-  // to explicitly change different running application types.
-  DCHECK_EQ(ShelfItemTypeToWeight(TYPE_WINDOWED_APP),
-            ShelfItemTypeToWeight(TYPE_PLATFORM_APP));
   ShelfItem weight_dummy;
-  weight_dummy.type = TYPE_WINDOWED_APP;
+  weight_dummy.type = TYPE_APP;
   return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                           CompareByWeight) -
          items_.begin();
 }
 
 int ShelfModel::FirstPanelIndex() const {
   ShelfItem weight_dummy;
   weight_dummy.type = TYPE_APP_PANEL;
   return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                           CompareByWeight) -
@@ skipping 45 matching lines @@
 
   return index;
 }
 
 void ShelfModel::RemoveShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     id_to_item_delegate_map_.erase(id);
 }
 
 }  // namespace ash