Commit 92408ead authored by Jenny Zhang's avatar Jenny Zhang Committed by Commit Bot

Whitelist demo mode scrennsaver app for krane(kukui).

kukui is the board name of krane device.

This cl is needed for setting up krane demo mode.

Bug:1027478
Change-Id: I469d26cb6c6dedf2f28d8e1d60e8d95cde372a07

TBR=xiyuan@chromium.org

Change-Id: I469d26cb6c6dedf2f28d8e1d60e8d95cde372a07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951808
Commit-Queue: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721831}
parent e37abb03
......@@ -53,7 +53,8 @@ DemoModeApp GetAppFromAppId(const std::string& app_id) {
if (app_id == extension_misc::kScreensaverAppId ||
app_id == extension_misc::kScreensaverEveAppId ||
app_id == extension_misc::kScreensaverNocturneAppId ||
app_id == extension_misc::kScreensaverAltAppId) {
app_id == extension_misc::kScreensaverAltAppId ||
app_id == extension_misc::kScreensaverKukuiAppId) {
return DemoModeApp::kScreensaver;
}
......
......@@ -44,7 +44,8 @@ TEST_P(InstallLimiterTest, ShouldDeferInstall) {
const std::vector<std::string> screensaver_ids = {
extension_misc::kScreensaverAppId, extension_misc::kScreensaverEveAppId,
extension_misc::kScreensaverNocturneAppId,
extension_misc::kScreensaverAltAppId};
extension_misc::kScreensaverAltAppId,
extension_misc::kScreensaverKukuiAppId};
chromeos::DemoModeTestHelper demo_mode_test_helper;
if (GetParam() != chromeos::DemoSession::DemoModeConfig::kNone)
......
......@@ -329,6 +329,8 @@ std::string DemoSession::GetScreensaverAppId() {
return extension_misc::kScreensaverNocturneAppId;
if (board == "atlas")
return extension_misc::kScreensaverAltAppId;
if (board == "kukui")
return extension_misc::kScreensaverKukuiAppId;
return extension_misc::kScreensaverAppId;
}
......
......@@ -26,7 +26,8 @@ const char* const kPublicSessionWhitelist[] = {
"haeblkpifdemlfnkogkipmghfcbonief", // Charismathics Smart Card Middleware
"mpnkhdpphjiihmlmkcamhpogecnnfffa", // Service NSW Kiosk Utility
"npilppbicblkkgjfnbmibmhhgjhobpll", // QwickACCESS
// TODO(isandrk): Only on the whitelist for the purpose of getting the soft MGS warning. Remove
// TODO(isandrk): Only on the whitelist for the purpose of getting the soft
// MGS warning. Remove
// once dynamic MGS warnings are implemented.
"ppkfnjlimknmjoaemnpidmdlfchhehel", // VMware Horizon Client for Chrome
......@@ -109,6 +110,7 @@ const char* const kPublicSessionWhitelist[] = {
"mnoijifedipmbjaoekhadjcijipaijjc", // Screensaver
"gdobaoeekhiklaljmhladjfdfkigampc", // Screensaver (eve)
"lminefdanffajachfahfpmphfkhahcnj", // Screensaver (nocturne)
"fafhbhdboeiciklpkminlncemohljlkj", // Screensaver (kukui)
"bnabjkecnachpogjlfilfcnlpcmacglh", // Screensaver (other)
// Testing extensions:
......
......@@ -130,6 +130,7 @@ const char kScreensaverAppId[] = "mnoijifedipmbjaoekhadjcijipaijjc";
const char kScreensaverEveAppId[] = "gdobaoeekhiklaljmhladjfdfkigampc";
const char kScreensaverNocturneAppId[] = "lminefdanffajachfahfpmphfkhahcnj";
const char kScreensaverAltAppId[] = "bnabjkecnachpogjlfilfcnlpcmacglh";
const char kScreensaverKukuiAppId[] = "fafhbhdboeiciklpkminlncemohljlkj";
bool IsSystemUIApp(base::StringPiece extension_id) {
static const char* const kApps[] = {
......
......@@ -235,6 +235,9 @@ extern const char kScreensaverNocturneAppId[];
// The extension id of an alternate Demo Mode screensaver app.
extern const char kScreensaverAltAppId[];
// The extension id of an kukui Demo Mode screensaver app.
extern const char kScreensaverKukuiAppId[];
// Returns true if this app is part of the "system UI". Generally this is UI
// that that on other operating systems would be considered part of the OS,
// for example the file manager.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment