Move app list

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/launcher/launcher_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int LauncherItemTypeToWeight(LauncherItemType type) {
   switch (type) {
+    case TYPE_APP_LIST:
+      return 0;
     case TYPE_BROWSER_SHORTCUT:
-      return 0;
+      return 1;
     case TYPE_APP_SHORTCUT:
-      return 1;
+      return 2;
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
     case TYPE_PLATFORM_APP:
-      return 2;
-    case TYPE_APP_LIST:
       return 3;
   }
 
   NOTREACHED() << "Invalid type " << type;
   return 2;
 }
 
 bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
   return LauncherItemTypeToWeight(a.type) < LauncherItemTypeToWeight(b.type);
 }
 
 }  // namespace
 
 LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
   LauncherItem app_list;
   app_list.type = TYPE_APP_LIST;
   app_list.is_incognito = false;
 
   LauncherItem browser_shortcut;
   browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
   browser_shortcut.is_incognito = false;
 
-  AddAt(0, browser_shortcut);
-  AddAt(1, app_list);
+  AddAt(0, app_list);
+  AddAt(1, browser_shortcut);
 }
 
 LauncherModel::~LauncherModel() {
 }
 
 int LauncherModel::Add(const LauncherItem& item) {
   return AddAt(items_.size(), item);
 }
 
 int LauncherModel::AddAt(int index, const LauncherItem& item) {
@@ skipping 85 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