Store AppItems as pages in AppListModel.

chrome/browser/ui/app_list/extension_app_model_builder.cc

Index: chrome/browser/ui/app_list/extension_app_model_builder.cc
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc
index 767bb7b7f2ed10f74577dcc0877f3675b88f544a..85f44d900c042e9acf10d5e84475f762cc131c5d 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc
@@ -160,11 +160,13 @@ void ExtensionAppModelBuilder::SwitchProfile(Profile* profile) {
   profile_ = profile;
 
   // Delete any extension apps.
-  app_list::AppListModel::Apps* app_list = model_->apps();
-  for (int i = static_cast<int>(app_list->item_count()) - 1; i >= 0; --i) {
-    app_list::AppListItemModel* item = app_list->GetItemAt(i);
-    if (item->GetAppType() == ExtensionAppItem::kAppType)
-      app_list->DeleteAt(i);
+  for (int p = static_cast<int>(model_->GetNumAppPages()) - 1; p >= 0; --p) {
+    const app_list::AppListModel::AppItems& app_list = model_->GetAppItems(p);
+    for (int i = static_cast<int>(app_list.item_count()) - 1; i >= 0; --i) {
+      const app_list::AppListItemModel* item = app_list.GetItemAt(i);
+      if (item->GetAppType() == ExtensionAppItem::kAppType)
+        model_->DeleteItemAt(0, i);

[koz (OOO until 15th September), 2013/10/18 05:17:17]

Should this be DeleteItemAt(p, i) ?

Also, why do we delete only items with type kAppType. Won't all the items need
to be removed in a profile switch?

[stevenjb, 2013/10/18 22:14:26]

Yes, thanks. Done.

This code will require some refactoring with the new sync, but in principle
ExtensionAppModelBuilder shouldn't be dealing with folders (or bookmarks if we
add those).

+    }
   }
 
   if (tracker_)