Store AppItems as pages in AppListModel.

chrome/browser/ui/app_list/extension_app_model_builder.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 "chrome/browser/ui/app_list/extension_app_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/prefs/pref_service.h"
@@ skipping 142 matching lines @@
                                            (*app)->is_platform_app()));
   }
 }
 
 void ExtensionAppModelBuilder::SwitchProfile(Profile* profile) {
   if (profile_ == profile)
     return;
   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_)
     tracker_->RemoveObserver(this);
 
   if (extensions::ExtensionSystem::Get(profile_)->extension_service())
     tracker_ = extensions::InstallTrackerFactory::GetForProfile(profile_);
   else
     tracker_ = NULL;
 
@@ skipping 54 matching lines @@
 void ExtensionAppModelBuilder::UpdateHighlight() {
   DCHECK(model_);
   if (!highlighted_app_pending_ || highlight_app_id_.empty())
     return;
   ExtensionAppItem* item = GetExtensionAppItem(highlight_app_id_);
   if (!item)
     return;
   item->SetHighlighted(true);
   highlighted_app_pending_ = false;
 }