Fetch ARC Kiosk app name and icon from Android side.

chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc

 // Copyright 2016 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/chromeos/app_mode/arc/arc_kiosk_app_service.h>
 
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
+#include "ui/base/layout.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification_blocker.h"
 
 namespace chromeos {
 
+namespace {
+
 // Timeout maintenance session after 30 minutes.
 constexpr base::TimeDelta kArcKioskMaintenanceSessionTimeout =
     base::TimeDelta::FromMinutes(30);
 
+// ARC icon is available only for 48x48 dips.
+constexpr int kArcAppIconSizeInDp = 48;

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

nit: Probably it is better to use kGridIconDimension. It seems we need one place
to define size of ARC icon. It is not safe to define size of icon in each file
(this can be done as separate CL)

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

Done.

+
+}  // namespace
+
 // Blocks all notifications for ARC Kiosk
 class ArcKioskNotificationBlocker : public message_center::NotificationBlocker {
  public:
   ArcKioskNotificationBlocker()
       : message_center::NotificationBlocker(
             message_center::MessageCenter::Get()) {
     NotifyBlockingStateChanged();
   }
 
   ~ArcKioskNotificationBlocker() override {}
@@ skipping 93 matching lines @@
   maintenance_timeout_timer_.Stop();
   maintenance_session_running_ = false;
   PreconditionsChanged();
 }
 
 void ArcKioskAppService::OnAppWindowLaunched() {
   if (delegate_)
     delegate_->OnAppWindowLaunched();
 }
 
+void ArcKioskAppService::OnIconUpdated(ArcAppIcon* icon) {
+  if (icon == app_icon_.get()) {

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

nit: Do you expect OnIconUpdated is called for not app_icon? May be DCHECK_EQ()?

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

Yes, now it's requested mostly once at any time. Initially it was requested
every time RequestNameAndIconUpdate() is called, i.e.probably several times in a
row, with new ArcAppIcon every time.

+    if (icon->image_skia().isNull()) {
+      app_icon_.release();
+      return;
+    }
+    app_manager_->UpdateNameAndIcon(app_info_->package_name, app_info_->name,
+                                    app_icon_->image_skia());
+  }
+}
+
 ArcKioskAppService::ArcKioskAppService(Profile* profile) : profile_(profile) {
   ArcAppListPrefs::Get(profile_)->AddObserver(this);
   app_manager_ = ArcKioskAppManager::Get();
   DCHECK(app_manager_);
   app_manager_->AddObserver(this);
   pref_change_registrar_.reset(new PrefChangeRegistrar());
   pref_change_registrar_->Init(profile_->GetPrefs());
   notification_blocker_.reset(new ArcKioskNotificationBlocker());
   PreconditionsChanged();
 }
 
 ArcKioskAppService::~ArcKioskAppService() {
   maintenance_timeout_timer_.Stop();
 }
 
+void ArcKioskAppService::RequestNameAndIconUpdate() {
+  // Request only once when app_icon_ is not initialized.
+  if (!app_info_ || !app_info_->ready || app_icon_)
+    return;
+  app_icon_.reset(new ArcAppIcon(profile_, app_id_, kArcAppIconSizeInDp, this));
+  app_icon_->LoadForScaleFactor(ui::GetSupportedScaleFactor(
+      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
+  // Name and icon are updated when icon is loaded in OnIconUpdated()
+}
+
 void ArcKioskAppService::PreconditionsChanged() {
   app_id_ = GetAppId();
   if (app_id_.empty())
     return;
   app_info_ = ArcAppListPrefs::Get(profile_)->GetApp(app_id_);
   if (app_info_ && app_info_->ready && !maintenance_session_running_) {
     if (!app_launcher_)
       app_launcher_ = base::MakeUnique<ArcKioskAppLauncher>(
           profile_, ArcAppListPrefs::Get(profile_), app_id_, this);
   } else if (task_id_ != -1) {
     arc::CloseTask(task_id_);
   }
+  RequestNameAndIconUpdate();
 }
 
 std::string ArcKioskAppService::GetAppId() {
   AccountId account_id = multi_user_util::GetAccountIdFromProfile(profile_);
-  const ArcKioskAppManager::ArcKioskApp* app =
-      app_manager_->GetAppByAccountId(account_id);
+  const ArcKioskAppData* app = app_manager_->GetAppByAccountId(account_id);
   if (!app)
     return std::string();
   std::unordered_set<std::string> app_ids =
-      ArcAppListPrefs::Get(profile_)->GetAppsForPackage(
-          app->app_info().package_name());
+      ArcAppListPrefs::Get(profile_)->GetAppsForPackage(app->app_id());
   if (app_ids.empty())
     return std::string();
   // TODO(poromov@): Choose appropriate app id to launch. See
   // http://crbug.com/665904
   return std::string(*app_ids.begin());
 }
 
 }  // namespace chromeos