ash:Shelf Update Alternate Layout

ash/launcher/launcher_model.cc

 // Copyright (c) 2012 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/launcher/launcher_model.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int LauncherItemTypeToWeight(LauncherItemType type) {
-  switch (type) {
-    case TYPE_BROWSER_SHORTCUT:
-    case TYPE_APP_SHORTCUT:
-    case TYPE_WINDOWED_APP:
-      return 0;
-    case TYPE_TABBED:
-    case TYPE_PLATFORM_APP:
-      return 1;
-    case TYPE_APP_LIST:
-      return ash::switches::UseAlternateShelfLayout() ? 0 : 2;
-    case TYPE_APP_PANEL:
-      return 3;
+  if (ash::switches::UseAlternateShelfLayout()) {
+    switch (type) {
+      case TYPE_APP_LIST:
+        return 0;
+      case TYPE_BROWSER_SHORTCUT:
+      case TYPE_APP_SHORTCUT:
+      case TYPE_WINDOWED_APP:
+        return 1;
+      case TYPE_TABBED:
+      case TYPE_PLATFORM_APP:
+        return 2;
+      case TYPE_APP_PANEL:
+        return 3;
+    }
+  } else {
+    switch (type) {
+      case TYPE_BROWSER_SHORTCUT:
+      case TYPE_APP_SHORTCUT:
+      case TYPE_WINDOWED_APP:
+        return 0;
+      case TYPE_TABBED:
+      case TYPE_PLATFORM_APP:
+        return 1;
+      case TYPE_APP_LIST:
+        return 2;
+      case TYPE_APP_PANEL:
+        return 3;
+    }
   }
 
   NOTREACHED() << "Invalid type " << type;
   return 1;
 }
 
 bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
   return LauncherItemTypeToWeight(a.type) < LauncherItemTypeToWeight(b.type);
 }
 
@@ skipping 120 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