Fetch ARC Kiosk app name and icon from Android side.

chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 480c624deff25aa38d16ecf16fd45e39f0c31e95..ded2b603494e1977a7d0228ff2bd40f3387f0e4d 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -129,21 +129,27 @@ void KioskAppMenuHandler::SendKioskApps() {
     apps_list.Append(std::move(app_info));
   }
 
-  const auto& arc_apps = ArcKioskAppManager::Get()->GetAllApps();
+  ArcKioskAppManager::Apps arc_apps;

[khmel, 2017/03/27 22:56:32]

nit: arc_kiosk_apps;? to reduce confusion.

[Sergey Poromov, 2017/03/28 15:25:55]

This class is only about kiosks and Chrome kiosk apps are named just "apps"
above, so "arc_apps" is compliant with them. I think no need for one more
"kiosk" word in the class.

+  ArcKioskAppManager::Get()->GetAllApps(&arc_apps);
   for (size_t i = 0; i < arc_apps.size(); ++i) {
     std::unique_ptr<base::DictionaryValue> app_info(
         new base::DictionaryValue());
     app_info->SetBoolean("isApp", true);
     app_info->SetBoolean("isAndroidApp", true);
-    app_info->SetString("id", arc_apps[i].app_info().package_name());
+    app_info->SetString("id", arc_apps[i]->app_id());
     app_info->SetString("account_email",
-                        arc_apps[i].account_id().GetUserEmail());
-    app_info->SetString("label", arc_apps[i].name());
+                        arc_apps[i]->account_id().GetUserEmail());
+    app_info->SetString("label", arc_apps[i]->name());
 
-    std::string icon_url =
-        webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance()
-                                     .GetImageNamed(IDR_APP_DEFAULT_ICON)
-                                     .ToSkBitmap());
+    std::string icon_url;
+    if (arc_apps[i]->icon().isNull()) {
+      icon_url =
+          webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance()
+                                       .GetImageNamed(IDR_APP_DEFAULT_ICON)
+                                       .ToSkBitmap());
+    } else {
+      icon_url = webui::GetBitmapDataUrl(*arc_apps[i]->icon().bitmap());
+    }
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(std::move(app_info));