Revert 152221 - 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_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) {
+LauncherModel::LauncherModel() : next_id_(1) {
   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);
@@ skipping 60 matching lines @@
 
 LauncherItems::const_iterator LauncherModel::ItemByID(int id) const {
   for (LauncherItems::const_iterator i = items_.begin();
        i != items_.end(); ++i) {
     if (i->id == id)
       return i;
   }
   return items_.end();
 }
 
-void LauncherModel::SetStatus(Status status) {
-  if (status_ == status)
-    return;
-
-  status_ = status;
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherStatusChanged());
-}
-
 void LauncherModel::AddObserver(LauncherModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void LauncherModel::RemoveObserver(LauncherModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 int LauncherModel::ValidateInsertionIndex(LauncherItemType type,
                                           int index) const {
   DCHECK(index >= 0 && index <= item_count());
 
   // Clamp |index| to the allowed range for the type as determined by |weight|.
   LauncherItem weight_dummy;
   weight_dummy.type = type;
   index = std::max(std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                                     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