Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide idle detection UI elements in Settings. #10299

Merged
merged 2 commits into from
Sep 29, 2021
Merged

Hide idle detection UI elements in Settings. #10299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
910ef29
Hide idle detection UI elements in Settings.
mkarolin Sep 28, 2021
676ebeb
Tie hiding of idle detection UI settings to kIdleDetection feature.
mkarolin Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions browser/resources/settings/brave_overrides/privacy_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@

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) => {
const pages = templateContent.getElementById('pages')
if (!pages) {
console.error(`[Brave Settings Overrides] Couldn't find privacy_page #pages`)
} else {
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>
<settings-subpage page-title="${I18nBehavior.i18n('siteSettingsCategoryAutoplay')}">
Expand Down
9 changes: 9 additions & 0 deletions browser/resources/settings/brave_overrides/site_details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@

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) => {
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) {
console.error(`[Brave Settings Overrides] Couldn't find first permission item`)
Expand Down
9 changes: 9 additions & 0 deletions browser/resources/settings/brave_overrides/site_settings_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -45,6 +46,14 @@ RegisterPolymerComponentReplacement(
if (!lists_.permissionsAdvanced) {
console.error('[Brave Settings Overrides] did not get lists_.permissionsAdvanced data')
} else {
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) {
console.error('Could not find automatic downloads site settings item')
Expand Down
4 changes: 4 additions & 0 deletions browser/ui/webui/brave_settings_ui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down