Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
===================================================================
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc	(revision 113069)
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc	(working copy)
@@ -326,12 +326,11 @@
   AutoReset<bool> auto_reset(&ignore_changes_, true);
 
   ListValue* list = new ListValue();
-  const ExtensionSet* extensions = extension_service_->extensions();
-  ExtensionSet::const_iterator it;
+  const ExtensionList* extensions = extension_service_->extensions();
+  ExtensionList::const_iterator it;
   for (it = extensions->begin(); it != extensions->end(); ++it) {
-    const Extension* extension = *it;
-    if (!IsAppExcludedFromList(extension)) {
-      DictionaryValue* app_info = GetAppInfo(extension);
+    if (!IsAppExcludedFromList(*it)) {
+      DictionaryValue* app_info = GetAppInfo(*it);
       list->Append(app_info);
     } else {
       // This is necessary because in some previous versions of chrome, we set a
@@ -339,8 +338,8 @@
       // and this fixes it. If we don't fix it, GetNaturalAppPageIndex() doesn't
       // work. See http://crbug.com/98325
       ExtensionPrefs* prefs = extension_service_->extension_prefs();
-      if (prefs->GetPageIndex(extension->id()) != -1)
-        prefs->ClearPageIndex(extension->id());
+      if (prefs->GetPageIndex((*it)->id()) != -1)
+        prefs->ClearPageIndex((*it)->id());
     }
   }
 
Property changes on: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
___________________________________________________________________
Added: svn:mergeinfo