Revert 170406 - Align panel icons on the right / end.

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_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;
-    case TYPE_APP_PANEL:
-      return 4;
   }
 
   NOTREACHED() << "Invalid type " << type;
   return 2;
 }
 
 bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
   return LauncherItemTypeToWeight(a.type) < LauncherItemTypeToWeight(b.type);
 }
 
@@ skipping 73 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();
 }
 
-int LauncherModel::FirstPanelIndex() const {
-  LauncherItem weight_dummy;
-  weight_dummy.type = TYPE_APP_PANEL;
-  return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
-                          CompareByWeight) - items_.begin();
-}
-
 void LauncherModel::SetStatus(Status status) {
   if (status_ == status)
     return;
 
   status_ = status;
   FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
                     LauncherStatusChanged());
 }
 
 void LauncherModel::AddObserver(LauncherModelObserver* observer) {
@@ skipping 15 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