Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 2691063002: arc: Use AndroidKioskAppInfoProto.display_name() as ARC++ Kiosk app name. (Closed)
Patch Set: fix post-merge nits from http://crrev.com/2451793002 Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index e954622d5a3310f6ee4869d43c5eb747c7cb5b13..a08da6c0ddaaeed30cbdbfcc14c55016e6e8c7a4 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -221,6 +221,11 @@ void DecodeLoginPolicies(
chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskAction,
entry->android_kiosk_app().action());
}
+ if (entry->android_kiosk_app().has_display_name()) {
+ entry_dict->SetStringWithoutPathExpansion(
+ chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName,
+ entry->android_kiosk_app().display_name());
+ }
} else if (entry->has_deprecated_public_session_id()) {
// Deprecated public session specification.
entry_dict->SetStringWithoutPathExpansion(

Powered by Google App Engine
This is Rietveld 408576698