After uninstall, remove last item in Launcher folder

ui/app_list/app_list_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 "ui/app_list/app_list_model.h"
 
 #include <string>
 
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
@@ skipping 262 matching lines @@
   DCHECK(folder) << "Folder not found for item: " << item->ToDebugString();
   scoped_ptr<AppListItem> child_item = RemoveItemFromFolder(folder, item);
   DCHECK_EQ(item, child_item.get());
   FOR_EACH_OBSERVER(AppListModelObserver,
                     observers_,
                     OnAppListItemWillBeDeleted(item));
   child_item.reset();  // Deletes item.
   FOR_EACH_OBSERVER(AppListModelObserver, observers_, OnAppListItemDeleted());
 }
 
+void AppListModel::DeleteUninstalledItem(const std::string& id) {
+  AppListItem* item = FindItem(id);
+  if (!item)
+    return;
+  const std::string folder_id = item->folder_id();
+  DeleteItem(id);
+
+  // Issue 368111: Upon uninstall of 2nd-to-last folder item, reparent last item

[stevenjb, 2015/03/30 17:23:59]

nit: crbug.com/368111:

[Greg Levin, 2015/03/30 23:08:52]

Done.

+  // to top and remove folder.
+  AppListFolderItem* folder = FindFolderItem(folder_id);
+  if (folder && folder->ChildItemCount() == 1u) {
+    FOR_EACH_OBSERVER(AppListModelObserver, observers_,
+                      OnSingleItemFolderWillBeDeleted(folder_id));

[stevenjb, 2015/03/30 17:23:59]

In DeleteItem() we call OnAppListItemWillBeDeleted. This should get called for
folders too. It seems like that method should be able to check for the case of a
folder being deleted and handle any special view logic there.

[Greg Levin, 2015/03/30 23:08:52]

Done.  Thanks for pointing this out.  It turns out that a small modification in
AppsGridView::OnFolderItemRemoved() (called from
AppListFolderView::OnAppListItemWillBeDeleted()) was all that was needed, I just
hadn't found the right spot before.

+
+    // Move last item in model, folder and views will update themselves.
+    AppListItem* last_item = folder->item_list()->item_at(0);
+    MoveItemToFolderAt(last_item, "", folder->position());
+  }
+}
+
 void AppListModel::NotifyExtensionPreferenceChanged() {
   for (size_t i = 0; i < top_level_item_list_->item_count(); ++i)
     top_level_item_list_->item_at(i)->OnExtensionPreferenceChanged();
 }
 
 void AppListModel::SetFoldersEnabled(bool folders_enabled) {
   folders_enabled_ = folders_enabled;
   if (folders_enabled)
     return;
   // Remove child items from folders.
@@ skipping 142 matching lines @@
   scoped_ptr<AppListItem> result = folder->item_list()->RemoveItem(item->id());
   result->set_folder_id("");
   if (folder->item_list()->item_count() == 0) {
     DVLOG(2) << "Deleting empty folder: " << folder->ToDebugString();
     DeleteItem(folder_id);
   }
   return result.Pass();
 }
 
 }  // namespace app_list