Fetch ARC Kiosk app name and icon from Android side.

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

 // Copyright 2013 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/webui/chromeos/login/kiosk_app_menu_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 111 matching lines @@
                                        .GetImageNamed(IDR_APP_DEFAULT_ICON)
                                        .ToSkBitmap());
     } else {
       icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
     }
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(std::move(app_info));
   }
 
-  const auto& arc_apps = ArcKioskAppManager::Get()->GetAllApps();
+  ArcKioskAppManager::Apps arc_apps;
+  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));
   }
 
   web_ui()->CallJavascriptFunctionUnsafe(
       EnableNewKioskUI() ? kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
       apps_list);
 }
 
@@ skipping 41 matching lines @@
 void KioskAppMenuHandler::UpdateState(NetworkError::ErrorReason reason) {
   if (network_state_informer_->state() == NetworkStateInformer::ONLINE)
     KioskAppManager::Get()->RetryFailedAppDataFetch();
 }
 
 void KioskAppMenuHandler::OnArcKioskAppsChanged() {
   SendKioskApps();
 }
 
 }  // namespace chromeos