Elim ActivateAppListItem, ChromeAppListItem

chrome/browser/ui/app_list/extension_app_item.h

Index: chrome/browser/ui/app_list/extension_app_item.h
diff --git a/chrome/browser/ui/app_list/extension_app_item.h b/chrome/browser/ui/app_list/extension_app_item.h
index d2c4b098bbf8f5f4f0cbb5c697e9da1808b4d8e5..776d51d39907df114a676a13a4b97ab47c4b9ee5 100644
--- a/chrome/browser/ui/app_list/extension_app_item.h
+++ b/chrome/browser/ui/app_list/extension_app_item.h
@@ -10,9 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/ui/app_list/app_context_menu_delegate.h"
-#include "chrome/browser/ui/app_list/chrome_app_list_item.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
 #include "sync/api/string_ordinal.h"
+#include "ui/app_list/app_list_item_model.h"
 #include "ui/gfx/image/image_skia.h"
 
 class AppListControllerDelegate;
@@ -29,7 +29,7 @@ class Extension;
 }
 
 // ExtensionAppItem represents an extension app in app list.
-class ExtensionAppItem : public ChromeAppListItem,
+class ExtensionAppItem : public app_list::AppListItemModel,
                          public extensions::IconImage::Observer,
                          public ExtensionEnableFlowDelegate,
                          public app_list::AppContextMenuDelegate {
@@ -42,9 +42,6 @@ class ExtensionAppItem : public ChromeAppListItem,
                    bool is_platform_app);
   virtual ~ExtensionAppItem();
 
-  // Reload the title and icon from the underlying extension.
-  void Reload();
-
   syncer::StringOrdinal GetPageOrdinal() const;
   syncer::StringOrdinal GetAppLaunchOrdinal() const;
 
@@ -59,6 +56,8 @@ class ExtensionAppItem : public ChromeAppListItem,
 
   const std::string& extension_id() const { return extension_id_; }
 
+  static std::string ExtensionAppType();
+
  private:
   // Gets extension associated with this model. Returns NULL if extension
   // no longer exists.
@@ -86,9 +85,11 @@ class ExtensionAppItem : public ChromeAppListItem,
   virtual void ExtensionEnableFlowFinished() OVERRIDE;
   virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE;
 
-  // Overridden from ChromeAppListItem:
+  // Overridden from AppListItemModel:
+  virtual std::string AppType() const OVERRIDE;
   virtual void Activate(int event_flags) OVERRIDE;
   virtual ui::MenuModel* GetContextMenuModel() OVERRIDE;
+  virtual void Update() OVERRIDE;
 
   // Overridden from app_list::AppContextMenuDelegate:
   virtual void ExecuteLaunchCommand(int event_flags) OVERRIDE;