Refactor extension app icon.

chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc

Index: chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
index 5d3945fc9a473e36a6ab97b65501e8c96c5b2f92..682942732995d8bc170a989d313192270988bf1c 100644
--- a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
@@ -58,14 +58,22 @@ void LauncherExtensionAppUpdater::OnShutdown(
   StopObservingExtensionRegistry();
 }
 
+void LauncherExtensionAppUpdater::OnPackageListInitialRefreshed() {

[khmel, 2017/04/20 00:13:38]

This is reason why badge may not be applied also.

+  const ArcAppListPrefs* prefs = ArcAppListPrefs::Get(browser_context());
+  const std::vector<std::string> package_names = prefs->GetPackagesFromPrefs();
+  for (auto& package_name : package_names)
+    UpdateEquivalentApp(package_name);
+}
+
 void LauncherExtensionAppUpdater::OnPackageInstalled(
     const arc::mojom::ArcPackageInfo& package_info) {
-  UpdateEquivalentHostedApp(package_info.package_name);
+  UpdateEquivalentApp(package_info.package_name);
 }
 
 void LauncherExtensionAppUpdater::OnPackageRemoved(
-    const std::string& package_name) {
-  UpdateEquivalentHostedApp(package_name);
+    const std::string& package_name,
+    bool uninstalled) {
+  UpdateEquivalentApp(package_name);
 }
 
 void LauncherExtensionAppUpdater::StartObservingExtensionRegistry() {
@@ -81,34 +89,15 @@ void LauncherExtensionAppUpdater::StopObservingExtensionRegistry() {
   extension_registry_ = nullptr;
 }
 
-void LauncherExtensionAppUpdater::UpdateHostedApps() {

[khmel, 2017/04/20 00:13:38]

Well, this code was not used. I had temptation to use it from
OnPackageListInitialRefreshed but it also contained bug 
if ((*it)->is_hosted_app())
Actually we handle not only hosted app.
So it was easier to remove dead code and just pass package from the list on
initial refresh.

-  if (!extension_registry_)
-    return;
-
-  UpdateHostedApps(extension_registry_->enabled_extensions());
-  UpdateHostedApps(extension_registry_->disabled_extensions());
-  UpdateHostedApps(extension_registry_->terminated_extensions());
-}
-
-void LauncherExtensionAppUpdater::UpdateHostedApps(
-    const extensions::ExtensionSet& extensions) {
-  content::BrowserContext* context = browser_context();
-  extensions::ExtensionSet::const_iterator it;
-  for (it = extensions.begin(); it != extensions.end(); ++it) {
-    if ((*it)->is_hosted_app())
-      delegate()->OnAppUpdated(context, (*it)->id());
-  }
-}
-
-void LauncherExtensionAppUpdater::UpdateHostedApp(const std::string& app_id) {
+void LauncherExtensionAppUpdater::UpdateApp(const std::string& app_id) {
   delegate()->OnAppUpdated(browser_context(), app_id);
 }
 
-void LauncherExtensionAppUpdater::UpdateEquivalentHostedApp(
+void LauncherExtensionAppUpdater::UpdateEquivalentApp(
     const std::string& arc_package_name) {
   const std::vector<std::string> extension_ids =
       extensions::util::GetEquivalentInstalledExtensions(browser_context(),
                                                          arc_package_name);
   for (const auto& iter : extension_ids)
-    UpdateHostedApp(iter);
+    UpdateApp(iter);
 }