Elim ActivateAppListItem, ChromeAppListItem

chrome/browser/ui/app_list/apps_model_builder.h

Index: chrome/browser/ui/app_list/apps_model_builder.h
diff --git a/chrome/browser/ui/app_list/apps_model_builder.h b/chrome/browser/ui/app_list/apps_model_builder.h
index 48628967079f3f421287c862c2c0af58623f14bd..f4b1deff6ff895d3ec9cdcc6fa1852214d899ce4 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.h
+++ b/chrome/browser/ui/app_list/apps_model_builder.h
@@ -18,6 +18,10 @@ class ExtensionAppItem;
 class ExtensionSet;
 class Profile;
 
+namespace app_list {
+class AppListItemModel;
+}
+
 namespace extensions {
 class Extension;
 class InstallTracker;
@@ -38,13 +42,13 @@ class AppsModelBuilder : public ui::ListModelObserver,
   virtual ~AppsModelBuilder();
 
   // Returns app instance with id |extension_id|.
-  ExtensionAppItem* GetApp(const std::string& extension_id);
+  app_list::AppListItemModel* GetApp(const std::string& extension_id);
 
   // Rebuilds the model with the given profile.
   void SwitchProfile(Profile* profile);
 
  private:
-  typedef std::vector<ExtensionAppItem*> Apps;
+  typedef std::vector<ExtensionAppItem*> ExtensionApps;
 
   // Overridden from extensions::InstallObserver:
   virtual void OnBeginExtensionInstall(const std::string& extension_id,
@@ -71,7 +75,7 @@ class AppsModelBuilder : public ui::ListModelObserver,
   virtual void OnShutdown() OVERRIDE;
 
   // Adds apps in |extensions| to |apps|.
-  void AddApps(const ExtensionSet* extensions, Apps* apps);
+  void AddApps(const ExtensionSet* extensions, ExtensionApps* apps);

[jennyz, 2013/10/03 20:40:27]

Should this be renamed as AddExtensionApps?

 
   // Populates the model with apps.
   void PopulateApps();
@@ -97,7 +101,11 @@ class AppsModelBuilder : public ui::ListModelObserver,
   void UpdateHighlight();
 
   // Returns app instance at given |index|.
-  ExtensionAppItem* GetAppAt(size_t index);
+  app_list::AppListItemModel* GetAppAt(size_t index);
+
+  // Returns the ExtensionAppItem at |index| or NULL if the item is not an
+  // exension app.
+  ExtensionAppItem* GetExtensionAppAt(size_t index);
 
   // ui::ListModelObserver overrides:
   virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE;