From 910ef297a1d5bd89e467ed2256e8736edc14b543 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 28 Sep 2021 14:12:57 -0400
Subject: [PATCH 1/2] Hide idle detection UI elements in Settings.

Fixes brave/brave-browser#18409
---
 browser/resources/settings/brave_overrides/privacy_page.js  | 6 ++++++
 browser/resources/settings/brave_overrides/site_details.js  | 6 ++++++
 .../settings/brave_overrides/site_settings_page.js          | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/browser/resources/settings/brave_overrides/privacy_page.js b/browser/resources/settings/brave_overrides/privacy_page.js
index ba268b9987f3..d8b54321a4f0 100644
--- a/browser/resources/settings/brave_overrides/privacy_page.js
+++ b/browser/resources/settings/brave_overrides/privacy_page.js
@@ -12,6 +12,12 @@ RegisterPolymerTemplateModifications({
     if (!pages) {
       console.error(`[Brave Settings Overrides] Couldn't find privacy_page #pages`)
     } else {
+      const idleDetection = templateContent.querySelector('[route-path="/content/idleDetection"]')
+      if (!idleDetection) {
+        console.error(`[Brave Settings Overrides] Couldn't find idle detection template`)
+      } else {
+        idleDetection.content.firstElementChild.hidden = true
+      }
       pages.insertAdjacentHTML('beforeend', `
         <template is="dom-if" route-path="/content/autoplay" no-search>
           <settings-subpage page-title="${I18nBehavior.i18n('siteSettingsCategoryAutoplay')}">
diff --git a/browser/resources/settings/brave_overrides/site_details.js b/browser/resources/settings/brave_overrides/site_details.js
index e2fb788a5cbc..36a9976ff290 100644
--- a/browser/resources/settings/brave_overrides/site_details.js
+++ b/browser/resources/settings/brave_overrides/site_details.js
@@ -8,6 +8,12 @@ import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'
 
 RegisterPolymerTemplateModifications({
   'site-details': (templateContent) => {
+    const idleDetectionItem = templateContent.querySelector('[category="[[contentSettingsTypesEnum_.IDLE_DETECTION]]"]')
+    if (!idleDetectionItem) {
+      console.error(`[Brave Settings Overrides] Couldn't find idle detection item`)
+    } else {
+      idleDetectionItem.hidden = true
+    }
     const firstPermissionItem = templateContent.querySelector('div.list-frame > site-details-permission:nth-child(1)')
     if (!firstPermissionItem) {
       console.error(`[Brave Settings Overrides] Couldn't find first permission item`)
diff --git a/browser/resources/settings/brave_overrides/site_settings_page.js b/browser/resources/settings/brave_overrides/site_settings_page.js
index f5be8ed30d21..49a9f043ae55 100644
--- a/browser/resources/settings/brave_overrides/site_settings_page.js
+++ b/browser/resources/settings/brave_overrides/site_settings_page.js
@@ -45,6 +45,12 @@ RegisterPolymerComponentReplacement(
         if (!lists_.permissionsAdvanced) {
           console.error('[Brave Settings Overrides] did not get lists_.permissionsAdvanced data')
         } else {
+          let indexForIdleDetection = lists_.permissionsAdvanced.findIndex(item => item.id === ContentSettingsTypes.IDLE_DETECTION)
+          if (indexForIdleDetection === -1) {
+            console.error('Could not find idle detection site settings item')
+          } else {
+            lists_.permissionsAdvanced.splice(indexForIdleDetection, 1)
+          }
           let indexForAutoplay = lists_.permissionsAdvanced.findIndex(item => item.id === ContentSettingsTypes.AUTOMATIC_DOWNLOADS)
           if (indexForAutoplay === -1) {
             console.error('Could not find automatic downloads site settings item')

From 676ebeb8d4ecea714e19d426c0e587d22e29e612 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 28 Sep 2021 15:03:05 -0400
Subject: [PATCH 2/2] Tie hiding of idle detection UI settings to
 kIdleDetection feature.

---
 .../settings/brave_overrides/privacy_page.js        | 13 ++++++++-----
 .../settings/brave_overrides/site_details.js        | 13 ++++++++-----
 .../settings/brave_overrides/site_settings_page.js  | 13 ++++++++-----
 browser/ui/webui/brave_settings_ui.cc               |  4 ++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/browser/resources/settings/brave_overrides/privacy_page.js b/browser/resources/settings/brave_overrides/privacy_page.js
index d8b54321a4f0..6b814cfecacf 100644
--- a/browser/resources/settings/brave_overrides/privacy_page.js
+++ b/browser/resources/settings/brave_overrides/privacy_page.js
@@ -5,6 +5,7 @@
 
 import {RegisterPolymerTemplateModifications} from 'chrome://brave-resources/polymer_overriding.js'
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 
 RegisterPolymerTemplateModifications({
   'settings-privacy-page': (templateContent) => {
@@ -12,11 +13,13 @@ RegisterPolymerTemplateModifications({
     if (!pages) {
       console.error(`[Brave Settings Overrides] Couldn't find privacy_page #pages`)
     } else {
-      const idleDetection = templateContent.querySelector('[route-path="/content/idleDetection"]')
-      if (!idleDetection) {
-        console.error(`[Brave Settings Overrides] Couldn't find idle detection template`)
-      } else {
-        idleDetection.content.firstElementChild.hidden = true
+      if (!loadTimeData.getBoolean('isIdleDetectionFeatureEnabled')) {
+        const idleDetection = templateContent.querySelector('[route-path="/content/idleDetection"]')
+        if (!idleDetection) {
+          console.error(`[Brave Settings Overrides] Couldn't find idle detection template`)
+        } else {
+          idleDetection.content.firstElementChild.hidden = true
+        }
       }
       pages.insertAdjacentHTML('beforeend', `
         <template is="dom-if" route-path="/content/autoplay" no-search>
diff --git a/browser/resources/settings/brave_overrides/site_details.js b/browser/resources/settings/brave_overrides/site_details.js
index 36a9976ff290..2a4766096dfd 100644
--- a/browser/resources/settings/brave_overrides/site_details.js
+++ b/browser/resources/settings/brave_overrides/site_details.js
@@ -5,14 +5,17 @@
 
 import {RegisterPolymerTemplateModifications} from 'chrome://brave-resources/polymer_overriding.js'
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 
 RegisterPolymerTemplateModifications({
   'site-details': (templateContent) => {
-    const idleDetectionItem = templateContent.querySelector('[category="[[contentSettingsTypesEnum_.IDLE_DETECTION]]"]')
-    if (!idleDetectionItem) {
-      console.error(`[Brave Settings Overrides] Couldn't find idle detection item`)
-    } else {
-      idleDetectionItem.hidden = true
+    if (!loadTimeData.getBoolean('isIdleDetectionFeatureEnabled')) {
+      const idleDetectionItem = templateContent.querySelector('[category="[[contentSettingsTypesEnum_.IDLE_DETECTION]]"]')
+      if (!idleDetectionItem) {
+        console.error(`[Brave Settings Overrides] Couldn't find idle detection item`)
+      } else {
+        idleDetectionItem.hidden = true
+      }
     }
     const firstPermissionItem = templateContent.querySelector('div.list-frame > site-details-permission:nth-child(1)')
     if (!firstPermissionItem) {
diff --git a/browser/resources/settings/brave_overrides/site_settings_page.js b/browser/resources/settings/brave_overrides/site_settings_page.js
index 49a9f043ae55..b09819a1fcf0 100644
--- a/browser/resources/settings/brave_overrides/site_settings_page.js
+++ b/browser/resources/settings/brave_overrides/site_settings_page.js
@@ -5,6 +5,7 @@
 
 import {define, RegisterPolymerComponentReplacement} from 'chrome://brave-resources/polymer_overriding.js'
 import {ContentSettingsTypes} from '../site_settings/constants.js'
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {SettingsSiteSettingsPageElement} from '../site_settings_page/site_settings_page.js'
 import {routes} from '../route.js'
 import './config.js'
@@ -45,11 +46,13 @@ RegisterPolymerComponentReplacement(
         if (!lists_.permissionsAdvanced) {
           console.error('[Brave Settings Overrides] did not get lists_.permissionsAdvanced data')
         } else {
-          let indexForIdleDetection = lists_.permissionsAdvanced.findIndex(item => item.id === ContentSettingsTypes.IDLE_DETECTION)
-          if (indexForIdleDetection === -1) {
-            console.error('Could not find idle detection site settings item')
-          } else {
-            lists_.permissionsAdvanced.splice(indexForIdleDetection, 1)
+          if (!loadTimeData.getBoolean('isIdleDetectionFeatureEnabled')) {
+            let indexForIdleDetection = lists_.permissionsAdvanced.findIndex(item => item.id === ContentSettingsTypes.IDLE_DETECTION)
+            if (indexForIdleDetection === -1) {
+              console.error('Could not find idle detection site settings item')
+            } else {
+              lists_.permissionsAdvanced.splice(indexForIdleDetection, 1)
+            }
           }
           let indexForAutoplay = lists_.permissionsAdvanced.findIndex(item => item.id === ContentSettingsTypes.AUTOMATIC_DOWNLOADS)
           if (indexForAutoplay === -1) {
diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc
index 45fa9b2dc2e6..17d9850c6b4e 100644
--- a/browser/ui/webui/brave_settings_ui.cc
+++ b/browser/ui/webui/brave_settings_ui.cc
@@ -28,6 +28,7 @@
 #include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "content/public/common/content_features.h"
 
 #if BUILDFLAG(ENABLE_SPARKLE)
 #include "brave/browser/ui/webui/settings/brave_relaunch_handler_mac.h"
@@ -84,6 +85,9 @@ void BraveSettingsUI::AddResources(content::WebUIDataSource* html_source,
   NavigationBarDataProvider::Initialize(html_source);
   if (auto* service = ViewCounterServiceFactory::GetForProfile(profile))
     service->InitializeWebUIDataSource(html_source);
+  html_source->AddBoolean(
+      "isIdleDetectionFeatureEnabled",
+      base::FeatureList::IsEnabled(features::kIdleDetection));
 #if BUILDFLAG(ENABLE_SIDEBAR)
   // TODO(simonhong): Remove this when sidebar is shipped by default in all
   // channels.