app_list: Show disabled/terminated apps.

- Include disabled and terminated apps in AppsModelBuilder;
- Update icon when apps are loaded/unloaded;
- Run ExtensionEnableFlow when clicked on disabled/terminated app;

BUG=157996
TEST=Verify disabled/terminated apps shows up in app launcher.

R=sky@chromium.org,benwells@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11573026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176173 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 0 deletions

diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
index fcbcc93..8cd3151 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -18,6 +18,11 @@ void AppListControllerDelegateAsh::DismissView() {
     ash::Shell::GetInstance()->ToggleAppList(NULL);
 }
 
+gfx::NativeWindow AppListControllerDelegateAsh::GetAppListWindow() {
+  DCHECK(ash::Shell::HasInstance());
+  return ash::Shell::GetInstance()->GetAppListWindow();
+}
+
 bool AppListControllerDelegateAsh::IsAppPinned(
     const std::string& extension_id) {
   return ChromeLauncherController::instance()->IsAppPinned(extension_id);
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
index d986a03d..c2449ea 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
@@ -17,6 +17,7 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {
  private:
   // AppListControllerDelegate overrides:
   virtual void DismissView() OVERRIDE;
+  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
   virtual bool IsAppPinned(const std::string& extension_id) OVERRIDE;
   virtual void PinApp(const std::string& extension_id) OVERRIDE;
   virtual void UnpinApp(const std::string& extension_id) OVERRIDE;