Revert of Shelf Cleanup (- binary files)

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 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:
-      return 2;
-    case TYPE_DIALOG:
-      return 3;
-    case TYPE_APP_PANEL:
-      return 4;
-    case TYPE_UNDEFINED:
-      NOTREACHED() << "ShelfItemType must be set";
-      return -1;
+  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:
+      case TYPE_PLATFORM_APP:
+        return 2;
+      case TYPE_DIALOG:
+        return 3;
+      case TYPE_APP_PANEL:
+        return 4;
+      case TYPE_UNDEFINED:
+        NOTREACHED() << "ShelfItemType must be set";
+        return -1;
+    }
+  } else {
+    switch (type) {
+      case TYPE_BROWSER_SHORTCUT:
+      case TYPE_APP_SHORTCUT:
+        return 0;
+      case TYPE_WINDOWED_APP:
+      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() << "ShelfItemType must be set";
+        return -1;
+    }
   }
 
   NOTREACHED() << "Invalid type " << type;
   return 1;
 }
 
 bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
   return ShelfItemTypeToWeight(a.type) < ShelfItemTypeToWeight(b.type);
 }
 
@@ skipping 115 matching lines @@
 
 void ShelfModel::AddObserver(ShelfModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ShelfModel::RemoveObserver(ShelfModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 int ShelfModel::ValidateInsertionIndex(ShelfItemType type, int index) const {
-  DCHECK(index >= 0 && index <= item_count() + 1);
+  DCHECK(index >= 0 && index <= item_count() +
+      (ash::switches::UseAlternateShelfLayout() ? 1 : 0));
 
   // Clamp |index| to the allowed range for the type as determined by |weight|.
   ShelfItem weight_dummy;
   weight_dummy.type = type;
   index = std::max(std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<ShelfItems::difference_type>(index));
   index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<ShelfItems::difference_type>(index));
 
   return index;
 }
 
 }  // namespace ash