Commit 9a864989 authored by Jeevan Shikaram's avatar Jeevan Shikaram Committed by Commit Bot

Remove unnecessary valueExists calls

Remove unnecessary valueExists calls in OS Settings as they are always defined.

Change-Id: I916c2194a02ce8aef997d9fb62752c20da8f1924
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636996Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664971}
parent f7789ff1
...@@ -162,19 +162,13 @@ Polymer({ ...@@ -162,19 +162,13 @@ Polymer({
vpnNameTemplate: loadTimeData.getString('vpnNameTemplate'), vpnNameTemplate: loadTimeData.getString('vpnNameTemplate'),
}; };
// TODO(crbug.com/961514) remove unnecessary valueExists() calls. this.showApps_ = loadTimeData.getBoolean('showApps');
this.showApps_ = loadTimeData.valueExists('showApps') && this.showAndroidApps_ = loadTimeData.getBoolean('androidAppsVisible');
loadTimeData.getBoolean('showApps');
this.showAndroidApps_ = loadTimeData.valueExists('androidAppsVisible') &&
loadTimeData.getBoolean('androidAppsVisible');
this.showKioskNextShell_ = loadTimeData.valueExists('showKioskNextShell') && this.showKioskNextShell_ = loadTimeData.valueExists('showKioskNextShell') &&
loadTimeData.getBoolean('showKioskNextShell'); loadTimeData.getBoolean('showKioskNextShell');
this.showCrostini_ = loadTimeData.valueExists('showCrostini') && this.showCrostini_ = loadTimeData.getBoolean('showCrostini');
loadTimeData.getBoolean('showCrostini'); this.showPluginVm_ = loadTimeData.getBoolean('showPluginVm');
this.showPluginVm_ = loadTimeData.valueExists('showPluginVm') && this.havePlayStoreApp_ = loadTimeData.getBoolean('havePlayStoreApp');
loadTimeData.getBoolean('showPluginVm');
this.havePlayStoreApp_ = loadTimeData.valueExists('havePlayStoreApp') &&
loadTimeData.getBoolean('havePlayStoreApp');
this.addEventListener('show-container', () => { this.addEventListener('show-container', () => {
this.$.container.style.visibility = 'visible'; this.$.container.style.visibility = 'visible';
......
...@@ -455,6 +455,7 @@ void SettingsUI::InitOSWebUIHandlers(Profile* profile, ...@@ -455,6 +455,7 @@ void SettingsUI::InitOSWebUIHandlers(Profile* profile,
html_source->AddBoolean("hasInternalStylus", html_source->AddBoolean("hasInternalStylus",
ash::stylus_utils::HasInternalStylus()); ash::stylus_utils::HasInternalStylus());
#if defined(KIOSK_NEXT) #if defined(KIOSK_NEXT)
// Remove valueExists call from os_settings_ui.js when the #define is removed.
html_source->AddBoolean( html_source->AddBoolean(
"showKioskNextShell", "showKioskNextShell",
base::FeatureList::IsEnabled(ash::features::kKioskNextShell) && base::FeatureList::IsEnabled(ash::features::kKioskNextShell) &&
......
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