Protect AppListItemList Add/Remove and fix sync bugs

ui/app_list/app_list_item_list.cc

 // Copyright (c) 2013 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 "ui/app_list/app_list_item_list.h"
 
 #include "ui/app_list/app_list_item.h"
 
 namespace app_list {
 
@@ skipping 24 matching lines @@
   for (size_t i = 0; i < app_list_items_.size(); ++i) {
     AppListItem* item = app_list_items_[i];
     if (item->id() == id) {
       *index = i;
       return true;
     }
   }
   return false;
 }
 
-size_t AppListItemList::AddItem(AppListItem* item) {
-  CHECK(std::find(app_list_items_.begin(), app_list_items_.end(), item)
-        == app_list_items_.end());
-  EnsureValidItemPosition(item);
-  size_t index = GetItemSortOrderIndex(item->position(), item->id());
-  app_list_items_.insert(app_list_items_.begin() + index, item);
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemAdded(index, item));
-  return index;
-}
-
-void AppListItemList::InsertItemAt(AppListItem* item, size_t index) {
-  DCHECK_LE(index, item_count());
-  if (item_count() == 0) {
-    AddItem(item);
-    return;
-  }
-
-  AppListItem* prev = index > 0 ? app_list_items_[index - 1] : NULL;
-  AppListItem* next = index <= app_list_items_.size() - 1 ?
-      app_list_items_[index] : NULL;
-  CHECK_NE(prev, next);
-
-  if (prev && next && prev->position().Equals(next->position()))
-    prev = NULL;
-
-  if (!prev)
-    item->set_position(next->position().CreateBefore());
-  else if (!next)
-    item->set_position(prev->position().CreateAfter());
-  else
-    item->set_position(prev->position().CreateBetween(next->position()));
-
-  app_list_items_.insert(app_list_items_.begin() + index, item);
-
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemAdded(index, item));
-}
-
-void AppListItemList::DeleteItem(const std::string& id) {
-  scoped_ptr<AppListItem> item = RemoveItem(id);
-  // |item| will be deleted on destruction.
-}
-
-void AppListItemList::DeleteItemsByType(const char* type) {
-  for (int i = static_cast<int>(app_list_items_.size()) - 1;
-       i >= 0; --i) {
-    AppListItem* item = app_list_items_[i];
-    if (!type || item->GetItemType() == type)
-      DeleteItemAt(i);
-  }
-}
-
-scoped_ptr<AppListItem> AppListItemList::RemoveItem(
-    const std::string& id) {
-  size_t index;
-  if (FindItemIndex(id, &index))
-    return RemoveItemAt(index);
-
-  return scoped_ptr<AppListItem>();
-}
-
-scoped_ptr<AppListItem> AppListItemList::RemoveItemAt(size_t index) {
-  DCHECK_LT(index, item_count());
-  AppListItem* item = app_list_items_[index];
-  app_list_items_.weak_erase(app_list_items_.begin() + index);
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemRemoved(index, item));
-  return make_scoped_ptr<AppListItem>(item);
-}
-
 void AppListItemList::MoveItem(size_t from_index, size_t to_index) {
   DCHECK_LT(from_index, item_count());
   DCHECK_LT(to_index, item_count());
   if (from_index == to_index)
     return;
 
   AppListItem* target_item = app_list_items_[from_index];
   app_list_items_.weak_erase(app_list_items_.begin() + from_index);
   app_list_items_.insert(app_list_items_.begin() + to_index, target_item);
 
@@ skipping 50 matching lines @@
   VLOG(2) << "SetItemPosition: " << item->id().substr(0, 8)
           << " -> " << new_position.ToDebugString()
           << " From: " << from_index << " To: " << to_index;
   item->set_position(new_position);
   app_list_items_.insert(app_list_items_.begin() + to_index, item);
   FOR_EACH_OBSERVER(AppListItemListObserver,
                     observers_,
                     OnListItemMoved(from_index, to_index, item));
 }
 
+// AppListItemList protected
+
+size_t AppListItemList::AddItem(AppListItem* item) {
+  CHECK(std::find(app_list_items_.begin(), app_list_items_.end(), item)
+        == app_list_items_.end());
+  EnsureValidItemPosition(item);
+  size_t index = GetItemSortOrderIndex(item->position(), item->id());
+  app_list_items_.insert(app_list_items_.begin() + index, item);
+  FOR_EACH_OBSERVER(AppListItemListObserver,
+                    observers_,
+                    OnListItemAdded(index, item));
+  return index;
+}
+
+void AppListItemList::DeleteItem(const std::string& id) {
+  scoped_ptr<AppListItem> item = RemoveItem(id);
+  // |item| will be deleted on destruction.
+}
+
+scoped_ptr<AppListItem> AppListItemList::RemoveItem(
+    const std::string& id) {
+  size_t index;
+  if (FindItemIndex(id, &index))
+    return RemoveItemAt(index);
+
+  return scoped_ptr<AppListItem>();
+}
+
+scoped_ptr<AppListItem> AppListItemList::RemoveItemAt(size_t index) {
+  DCHECK_LT(index, item_count());
+  AppListItem* item = app_list_items_[index];
+  app_list_items_.weak_erase(app_list_items_.begin() + index);
+  FOR_EACH_OBSERVER(AppListItemListObserver,
+                    observers_,
+                    OnListItemRemoved(index, item));
+  return make_scoped_ptr<AppListItem>(item);
+}
+
 // AppListItemList private
 
 void AppListItemList::DeleteItemAt(size_t index) {
   scoped_ptr<AppListItem> item = RemoveItemAt(index);
   // |item| will be deleted on destruction.
 }
 
 void AppListItemList::EnsureValidItemPosition(AppListItem* item) {
   syncer::StringOrdinal position = item->position();
   if (position.IsValid())
@@ skipping 15 matching lines @@
     if (position.LessThan(app_list_items_[index]->position()) ||
         (position.Equals(app_list_items_[index]->position()) &&
          (id < app_list_items_[index]->id()))) {
       return index;
     }
   }
   return app_list_items_.size();
 }
 
 }  // namespace app_list