Elim ActivateAppListItem, ChromeAppListItem

chrome/browser/ui/app_list/apps_model_builder.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_APPS_MODEL_BUILDER_H_
 #define CHROME_BROWSER_UI_APP_LIST_APPS_MODEL_BUILDER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/extensions/install_observer.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/base/models/list_model_observer.h"
 
 class AppListControllerDelegate;
 class ExtensionAppItem;
 class ExtensionSet;
 class Profile;
 
+namespace app_list {
+class AppListItemModel;
+}
+
 namespace extensions {
 class Extension;
 class InstallTracker;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 // This class populates and maintains the given |model| with information from
 // |profile|.
 class AppsModelBuilder : public ui::ListModelObserver,
                          public extensions::InstallObserver {
  public:
   AppsModelBuilder(Profile* profile,
                    app_list::AppListModel::Apps* model,
                    AppListControllerDelegate* controller);
   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,
                                        const std::string& extension_name,
                                        const gfx::ImageSkia& installing_icon,
                                        bool is_app,
                                        bool is_platform_app) OVERRIDE;
 
   virtual void OnDownloadProgress(const std::string& extension_id,
                                   int percent_downloaded) OVERRIDE;
 
   virtual void OnInstallFailure(const std::string& extension_id) OVERRIDE;
   virtual void OnExtensionInstalled(
       const extensions::Extension* extension) OVERRIDE {}
   virtual void OnExtensionLoaded(
       const extensions::Extension* extension) OVERRIDE;
   virtual void OnExtensionUnloaded(
       const extensions::Extension* extension) OVERRIDE;
   virtual void OnExtensionUninstalled(
       const extensions::Extension* extension) OVERRIDE;
   virtual void OnAppsReordered() OVERRIDE;
   virtual void OnAppInstalledToAppList(
       const std::string& extension_id) OVERRIDE;
   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();
 
   // Re-sort apps in case app ordinal prefs are changed.
   void ResortApps();
 
   // Inserts an app based on app ordinal prefs.
   void InsertApp(ExtensionAppItem* app);
 
   // Returns the index of the application app with |app_id| in |model_|. If
   // no match is found, returns -1.
   int FindApp(const std::string& app_id);
 
   // Sets which app is intended to be highlighted. Will remove the highlight
   // from a currently highlighted app.
   void SetHighlightedApp(const std::string& extension_id);
 
   // Sets the application app with |highlight_app_id_| in |model_| as
   // highlighted if |highlighted_app_pending_| is true. If such an app is found,
   // reset |highlighted_app_pending_| so that won't be highlighted again until
   // another call to SetHighlightedApp() is made.
   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;
   virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE;
   virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE;
   virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE;
 
   Profile* profile_;
   AppListControllerDelegate* controller_;
 
   // Sub apps model of AppListModel that represents apps grid view.
   app_list::AppListModel::Apps* model_;
 
   std::string highlight_app_id_;
 
   // True if we haven't set |highlight_app_id_| to be highlighted. This happens
   // if we try to highlight an app that doesn't exist in the list yet.
   bool highlighted_app_pending_;
 
   // True to ignore |model_| changes.
   bool ignore_changes_;
 
   // We listen to this to show app installing progress.
   extensions::InstallTracker* tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsModelBuilder);
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APPS_MODEL_BUILDER_H_