arc: Use AndroidKioskAppInfoProto.display_name() as ARC++ Kiosk app name.

chrome/browser/chromeos/policy/device_local_account.cc

 // Copyright (c) 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/chromeos/policy/device_local_account.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
@@ skipping 17 matching lines @@
 
 const char kPublicAccountDomainPrefix[] = "public-accounts";
 const char kKioskAppAccountDomainPrefix[] = "kiosk-apps";
 const char kArcKioskAppAccountDomainPrefix[] = "arc-kiosk-apps";
 const char kDeviceLocalAccountDomainSuffix[] = ".device-local.localhost";
 
 }  // namespace
 
 ArcKioskAppBasicInfo::ArcKioskAppBasicInfo(const std::string& package_name,
                                            const std::string& class_name,
-                                           const std::string& action)
-    : package_name_(package_name), class_name_(class_name), action_(action) {}
+                                           const std::string& action,
+                                           const std::string& display_name)
+    : package_name_(package_name),
+      class_name_(class_name),
+      action_(action),
+      display_name_(display_name) {}
 
 ArcKioskAppBasicInfo::ArcKioskAppBasicInfo(const ArcKioskAppBasicInfo& other) =
     default;
 
 ArcKioskAppBasicInfo::ArcKioskAppBasicInfo() {}
 
 ArcKioskAppBasicInfo::~ArcKioskAppBasicInfo() {}
 
 bool ArcKioskAppBasicInfo::operator==(const ArcKioskAppBasicInfo& other) const {
   return this->package_name_ == other.package_name_ &&
          this->action_ == other.action_ &&
-         this->class_name_ == other.class_name_;
+         this->class_name_ == other.class_name_ &&
+         this->display_name_ == other.display_name_;
 }
 
 DeviceLocalAccount::DeviceLocalAccount(Type type,
                                        const std::string& account_id,
                                        const std::string& kiosk_app_id,
                                        const std::string& kiosk_app_update_url)
     : type(type),
       account_id(account_id),
       user_id(GenerateDeviceLocalAccountUserId(account_id, type)),
       kiosk_app_id(kiosk_app_id),
@@ skipping 101 matching lines @@
       if (!it->arc_kiosk_app_info.class_name().empty()) {
         entry->SetStringWithoutPathExpansion(
             chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskClass,
             it->arc_kiosk_app_info.class_name());
       }
       if (!it->arc_kiosk_app_info.action().empty()) {
         entry->SetStringWithoutPathExpansion(
             chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskAction,
             it->arc_kiosk_app_info.action());
       }
+      if (!it->arc_kiosk_app_info.display_name().empty()) {
+        entry->SetStringWithoutPathExpansion(
+            chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName,
+            it->arc_kiosk_app_info.display_name());
+      }
     }
     list.Append(std::move(entry));
   }
 
   service->Set(chromeos::kAccountsPrefDeviceLocalAccounts, list);
 }
 
 std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
     chromeos::CrosSettings* cros_settings) {
   std::vector<DeviceLocalAccount> accounts;
@@ skipping 60 matching lines @@
 
         accounts.push_back(
             DeviceLocalAccount(DeviceLocalAccount::TYPE_KIOSK_APP, account_id,
                                kiosk_app_id, kiosk_app_update_url));
         break;
       }
       case DeviceLocalAccount::TYPE_ARC_KIOSK_APP: {
         std::string package_name;
         std::string class_name;
         std::string action;
+        std::string display_name;
         if (!entry->GetStringWithoutPathExpansion(
                 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskPackage,
                 &package_name)) {
           LOG(ERROR) << "Missing package name in ARC kiosk type device-local "
                         "account at index "
                      << i << ".";
           continue;
         }
         entry->GetStringWithoutPathExpansion(
             chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskClass,
             &class_name);
         entry->GetStringWithoutPathExpansion(
             chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskAction,
             &action);
+        entry->GetStringWithoutPathExpansion(
+            chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName,
+            &display_name);
         const ArcKioskAppBasicInfo arc_kiosk_app(package_name, class_name,
-                                                 action);
+                                                 action, display_name);
 
         accounts.push_back(DeviceLocalAccount(arc_kiosk_app, account_id));
         break;
       }
       case DeviceLocalAccount::TYPE_COUNT:
         NOTREACHED();
     }
   }
   return accounts;
 }
 
 }  // namespace policy