Insert panel icons on the left of other panel icons.

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"
 
@@ skipping 19 matching lines @@
   NOTREACHED() << "Invalid type " << type;
   return 1;
 }
 
 bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
   return LauncherItemTypeToWeight(a.type) < LauncherItemTypeToWeight(b.type);
 }
 
 }  // namespace
 
+const int LauncherModel::kAutomaticIndex = -1;
+
 LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
   LauncherItem app_list;
   app_list.type = TYPE_APP_LIST;
   app_list.is_incognito = false;
   AddAt(0, app_list);
 }
 
 LauncherModel::~LauncherModel() {
 }
 
 int LauncherModel::Add(const LauncherItem& item) {
-  return AddAt(items_.size(), item);
+  return AddAt(kAutomaticIndex, item);
 }
 
 int LauncherModel::AddAt(int index, const LauncherItem& item) {
+  // Panel icons are by default inserted to the left of other panel icons since
+  // they are right aligned.
+  if (index == kAutomaticIndex)

[sky, 2013/06/25 16:19:45]

Can we move this magic to where we create panel items?

[flackr, 2013/06/25 17:40:52]

Sure, done.

+    index = item.type == TYPE_APP_PANEL ? 0 : items_.size();
   index = ValidateInsertionIndex(item.type, index);
   items_.insert(items_.begin() + index, item);
   items_[index].id = next_id_++;
   FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
                     LauncherItemAdded(index));
   return index;
 }
 
 void LauncherModel::RemoveItemAt(int index) {
   DCHECK(index >= 0 && index < item_count());
@@ skipping 92 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