chromeos: Sync animation.

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"
-#include "ui/aura/window.h"
 
 namespace ash {
 
 namespace {
 
 int LauncherItemTypeToWeight(LauncherItemType type) {
   switch (type) {
     case TYPE_BROWSER_SHORTCUT:
       return 0;
     case TYPE_APP_SHORTCUT:
       return 1;
+    case TYPE_APP_PLACEHOLDER:
+      return 2;
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
     case TYPE_PLATFORM_APP:
-      return 2;
+      return 3;
     case TYPE_APP_LIST:
-      return 3;
+      return 4;
   }
 
   NOTREACHED() << "Invalid type " << type;
-  return 2;
+  return 3;
 }
 
 bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
   return LauncherItemTypeToWeight(a.type) < LauncherItemTypeToWeight(b.type);
 }
 
 }  // namespace
 
 LauncherModel::LauncherModel() : next_id_(1) {
   LauncherItem app_list;
@@ skipping 95 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