ARC: Add badge for Chrome hosted Apps if Arc++ is enabled.

chrome/browser/ui/app_list/extension_app_model_builder.cc

 // 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.
 
 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
+#include "chrome/browser/ui/ash/launcher/launcher_extension_app_updater.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using extensions::Extension;
 
 ExtensionAppModelBuilder::ExtensionAppModelBuilder(
     AppListControllerDelegate* controller)
     : AppListModelBuilder(controller, ExtensionAppItem::kItemType) {
 }
 
 ExtensionAppModelBuilder::~ExtensionAppModelBuilder() {
   OnShutdown();
-  OnShutdown(extension_registry_);
 }
 
 void ExtensionAppModelBuilder::InitializePrefChangeRegistrars() {
   profile_pref_change_registrar_.Init(profile()->GetPrefs());
   profile_pref_change_registrar_.Add(
       prefs::kHideWebStoreIcon,
       base::Bind(&ExtensionAppModelBuilder::OnProfilePreferenceChanged,
                  base::Unretained(this)));
 
   if (!extensions::util::IsNewBookmarkAppsEnabled())
@@ skipping 73 matching lines @@
   if (!item)
     return;
   item->SetPercentDownloaded(percent_downloaded);
 }
 
 void ExtensionAppModelBuilder::OnInstallFailure(
     const std::string& extension_id) {
   model()->DeleteItem(extension_id);
 }
 
-void ExtensionAppModelBuilder::OnExtensionLoaded(
+void ExtensionAppModelBuilder::OnAppInstalled(
     content::BrowserContext* browser_context,
-    const extensions::Extension* extension) {
+    const std::string& app_id) {
+  extensions::ExtensionRegistry* extension_registry =
+      extensions::ExtensionRegistry::Get(profile());
+
+  const Extension* extension =
+      extension_registry ? extension_registry->GetInstalledExtension(app_id)
+                         : nullptr;
+  if (!extension) {
+    NOTREACHED();
+    return;
+  }
+
   if (!extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile()))
     return;
 
-  DVLOG(2) << service() << ": OnExtensionLoaded: "
-           << extension->id().substr(0, 8);
-  ExtensionAppItem* existing_item = GetExtensionAppItem(extension->id());
+  DVLOG(2) << service() << ": OnAppInstalled: " << app_id.substr(0, 8);
+  ExtensionAppItem* existing_item = GetExtensionAppItem(app_id);
   if (existing_item) {
-    existing_item->Reload();
+    existing_item->UpdateIcon();
     if (service())
       service()->UpdateItem(existing_item);
     return;
   }
 
-  InsertApp(CreateAppItem(extension->id(),
-                          "",
-                          gfx::ImageSkia(),
+  InsertApp(CreateAppItem(app_id, "", gfx::ImageSkia(),
                           extension->is_platform_app()));
 }
 
-void ExtensionAppModelBuilder::OnExtensionUnloaded(
+void ExtensionAppModelBuilder::OnAppUpdated(
     content::BrowserContext* browser_context,
-    const extensions::Extension* extension,
-    extensions::UnloadedExtensionInfo::Reason reason) {
-  ExtensionAppItem* item = GetExtensionAppItem(extension->id());
+    const std::string& app_id) {
+  ExtensionAppItem* item = GetExtensionAppItem(app_id);
   if (!item)
     return;
   item->UpdateIcon();
 }
 
-void ExtensionAppModelBuilder::OnExtensionUninstalled(
+void ExtensionAppModelBuilder::OnAppUninstalled(
     content::BrowserContext* browser_context,
-    const extensions::Extension* extension,
-    extensions::UninstallReason reason) {
+    const std::string& app_id) {
   if (service()) {
-    DVLOG(2) << service() << ": OnExtensionUninstalled: "
-             << extension->id().substr(0, 8);
-    service()->RemoveUninstalledItem(extension->id());
+    DVLOG(2) << service() << ": OnAppUninstalled: " << app_id.substr(0, 8);
+    service()->RemoveUninstalledItem(app_id);
     return;
   }
-  model()->DeleteUninstalledItem(extension->id());
+  model()->DeleteUninstalledItem(app_id);
 }
 
 void ExtensionAppModelBuilder::OnDisabledExtensionUpdated(
     const Extension* extension) {
   if (!extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile()))
     return;
 
   ExtensionAppItem* existing_item = GetExtensionAppItem(extension->id());
   if (existing_item)
     existing_item->Reload();
 }
 
 void ExtensionAppModelBuilder::OnShutdown() {
   if (tracker_) {
     tracker_->RemoveObserver(this);
     tracker_ = nullptr;
   }
-}
-
-void ExtensionAppModelBuilder::OnShutdown(
-    extensions::ExtensionRegistry* registry) {
-  if (!extension_registry_)
-    return;
-
-  DCHECK_EQ(extension_registry_, registry);
-  extension_registry_->RemoveObserver(this);
-  extension_registry_ = nullptr;
+  app_updater_.reset();
 }
 
 std::unique_ptr<ExtensionAppItem> ExtensionAppModelBuilder::CreateAppItem(
     const std::string& extension_id,
     const std::string& extension_name,
     const gfx::ImageSkia& installing_icon,
     bool is_platform_app) {
   return base::WrapUnique(
       new ExtensionAppItem(profile(), GetSyncItem(extension_id), extension_id,
                            extension_name, installing_icon, is_platform_app));
 }
 
 void ExtensionAppModelBuilder::BuildModel() {
   DCHECK(!tracker_);
 
   InitializePrefChangeRegistrars();
 
   tracker_ = controller()->GetInstallTrackerFor(profile());
-  extension_registry_ = extensions::ExtensionRegistry::Get(profile());
 
   PopulateApps();
 
   // Start observing after model is built.
   if (tracker_)
     tracker_->AddObserver(this);
 
-  if (extension_registry_)
-    extension_registry_->AddObserver(this);
+  app_updater_.reset(new LauncherExtensionAppUpdater(this, profile()));
 }
 
 void ExtensionAppModelBuilder::PopulateApps() {
   extensions::ExtensionSet extensions;
   controller()->GetApps(profile(), &extensions);
 
   for (extensions::ExtensionSet::const_iterator app = extensions.begin();
        app != extensions.end(); ++app) {
     if (!extensions::ui_util::ShouldDisplayInAppLauncher(app->get(), profile()))
       continue;
@@ skipping 33 matching lines @@
     app_list::AppListItem* item = item_list->item_at(idx + 1);
     if (item->GetItemType() == ExtensionAppItem::kItemType) {
       next = static_cast<ExtensionAppItem*>(item);
       break;
     }
   }
   // item->Move will call set_position, overriding the item's position.
   if (prev || next)
     static_cast<ExtensionAppItem*>(item)->Move(prev, next);
 }