From 862c426d7a7b667e6abd9300cc959dcb53fe5513 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 2 Jul 2024 14:36:26 -0700 Subject: [PATCH] Remove CookieView-related files from the settings page (uplift to 1.68.x) (#24456) Merge pull request #24256 from jagadeshjai/fix__settings_cookies_view_leftover [Cookies] Remove CookieView-related files from the settings page --- app/brave_settings_strings.grdp | 12 -- .../settings/brave_overrides/basic_page.ts | 1 - .../settings/brave_overrides/config.ts | 2 - .../settings/brave_overrides/privacy_page.ts | 28 +-- .../settings/brave_overrides/site_details.ts | 33 +--- .../brave_privacy_page/brave_privacy_page.ts | 21 -- browser/resources/settings/brave_routes.ts | 7 +- .../brave_site_details/brave_site_details.ts | 23 --- .../brave_site_data_details_subpage.html | 44 ----- .../brave_site_data_details_subpage.ts | 182 ------------------ .../brave_site_settings/cookie_info.ts | 103 ---------- .../local_data_browser_proxy.ts | 79 -------- browser/resources/settings/sources.gni | 5 - ...ave_settings_localized_strings_provider.cc | 5 - ...browser-resources-settings-router.ts.patch | 2 +- 15 files changed, 4 insertions(+), 543 deletions(-) delete mode 100644 browser/resources/settings/brave_privacy_page/brave_privacy_page.ts delete mode 100644 browser/resources/settings/brave_site_details/brave_site_details.ts delete mode 100644 browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.html delete mode 100644 browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.ts delete mode 100644 browser/resources/settings/brave_site_settings/cookie_info.ts delete mode 100644 browser/resources/settings/brave_site_settings/local_data_browser_proxy.ts diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp index c614b4275379..951c685c0928 100644 --- a/app/brave_settings_strings.grdp +++ b/app/brave_settings_strings.grdp @@ -559,18 +559,6 @@ Clear on site close - - Cookies and Site Data - - - Show all cookies and locally stored data for this site - - - $1www.example.com locally stored data - - - Remove All - diff --git a/browser/resources/settings/brave_overrides/basic_page.ts b/browser/resources/settings/brave_overrides/basic_page.ts index 06dad203d81f..2f05421cbb62 100644 --- a/browser/resources/settings/brave_overrides/basic_page.ts +++ b/browser/resources/settings/brave_overrides/basic_page.ts @@ -15,7 +15,6 @@ import '../brave_ipfs_page/brave_ipfs_page.js' import '../brave_new_tab_page/brave_new_tab_page.js' import '../brave_search_engines_page/brave_search_engines_page.js' import '../brave_sync_page/brave_sync_page.js' -import '../brave_site_settings/brave_site_data_details_subpage.js' import '../brave_tor_page/brave_tor_subpage.js' import '../brave_wallet_page/brave_wallet_page.js' import '../brave_web3_domains_page/brave_web3_domains_page.js' diff --git a/browser/resources/settings/brave_overrides/config.ts b/browser/resources/settings/brave_overrides/config.ts index bbddf05b41d7..3e124f298b0c 100644 --- a/browser/resources/settings/brave_overrides/config.ts +++ b/browser/resources/settings/brave_overrides/config.ts @@ -17,6 +17,4 @@ import {RegisterPolymerComponentToIgnore} from 'chrome://resources/brave/polymer RegisterPolymerComponentToIgnore('add-site-dialog') RegisterPolymerComponentToIgnore('settings-site-settings-page') RegisterPolymerComponentToIgnore('settings-clear-browsing-data-dialog') -RegisterPolymerComponentToIgnore('site-details') RegisterPolymerComponentToIgnore('settings-autofill-page') -RegisterPolymerComponentToIgnore('settings-privacy-page') diff --git a/browser/resources/settings/brave_overrides/privacy_page.ts b/browser/resources/settings/brave_overrides/privacy_page.ts index 711e647c7ffc..1379800d2b60 100644 --- a/browser/resources/settings/brave_overrides/privacy_page.ts +++ b/browser/resources/settings/brave_overrides/privacy_page.ts @@ -3,8 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import {html, RegisterPolymerTemplateModifications, RegisterPolymerComponentReplacement} from 'chrome://resources/brave/polymer_overriding.js' -import {BraveSettingsPrivacyPageElement} from '../brave_privacy_page/brave_privacy_page.js' +import {html, RegisterPolymerTemplateModifications} from 'chrome://resources/brave/polymer_overriding.js' import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import {loadTimeData} from '../i18n_setup.js' @@ -182,30 +181,6 @@ function InsertShieldsSubpage (pages: Element) `) } -function InsertCookiesSubpage (pages: Element) -{ - pages.appendChild( - html` - - `) -} - -RegisterPolymerComponentReplacement( - 'settings-privacy-page', - BraveSettingsPrivacyPageElement -) - RegisterPolymerTemplateModifications({ 'settings-privacy-page': (templateContent) => { const pages = templateContent.getElementById('pages') @@ -241,7 +216,6 @@ RegisterPolymerTemplateModifications({ InsertSolanaSubpage(pages) } InsertShieldsSubpage(pages) - InsertCookiesSubpage(pages) const permissionsLinkRow = templateContent.getElementById('permissionsLinkRow') if (!permissionsLinkRow) { diff --git a/browser/resources/settings/brave_overrides/site_details.ts b/browser/resources/settings/brave_overrides/site_details.ts index c64872ab1ee1..4d6f70cb96d7 100644 --- a/browser/resources/settings/brave_overrides/site_details.ts +++ b/browser/resources/settings/brave_overrides/site_details.ts @@ -5,19 +5,13 @@ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import {RegisterPolymerTemplateModifications,RegisterPolymerComponentReplacement} from 'chrome://resources/brave/polymer_overriding.js' +import {RegisterPolymerTemplateModifications} from 'chrome://resources/brave/polymer_overriding.js' import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import {loadTimeData} from '../i18n_setup.js' -import {BraveSiteDetailsElement} from '../brave_site_details/brave_site_details.js' import 'chrome://resources/brave/leo.bundle.js' -RegisterPolymerComponentReplacement( - 'site-details', - BraveSiteDetailsElement -) - RegisterPolymerTemplateModifications({ 'site-details': (templateContent) => { if (!loadTimeData.getBoolean('isIdleDetectionFeatureEnabled')) { @@ -147,30 +141,5 @@ RegisterPolymerTemplateModifications({ // In Chromium, the VR and AR icons are the same but we want to have separate ones. templateContent.querySelector('site-details-permission[icon="settings:vr-headset"]')?.setAttribute('icon', 'smartphone-hand') - - const usageSection = templateContent.querySelector('div#usage') - if (!usageSection) { - console.error(`[Brave Settings Overrides] Couldn't find usageSection item`) - } else { - usageSection.insertAdjacentHTML( - 'afterend', - getTrustedHTML` - - - - - `) - const cookiesDetail = - templateContent.querySelector('#cookiesLink') - if (!cookiesDetail) { - console.error( - '[Brave Settings Overrides] Couldn\'t find cookies link') - } else { - cookiesDetail.setAttribute('label', - loadTimeData.getString('siteCookiesLinkLabel')) - cookiesDetail.setAttribute('sub-label', - loadTimeData.getString('siteCookiesLinkDesc')) - } - } } }) diff --git a/browser/resources/settings/brave_privacy_page/brave_privacy_page.ts b/browser/resources/settings/brave_privacy_page/brave_privacy_page.ts deleted file mode 100644 index f2b94a878687..000000000000 --- a/browser/resources/settings/brave_privacy_page/brave_privacy_page.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -import {SettingsPrivacyPageElement} from '../privacy_page/privacy_page.js' - -// Extend SettingsPrivacyPageElement to add clear cookies handler. -export class BraveSettingsPrivacyPageElement - extends SettingsPrivacyPageElement { - onRemoveAllCookiesFromSite_ () { - // Intentionally not casting to SiteDataDetailsSubpageElement, as this would - // require importing site_data_details_subpage.js and would endup in the - // main JS bundle. - const node = - this.shadowRoot!.querySelector('brave-site-data-details-subpage'); - if (node) { - node.removeAll(); - } - } -} diff --git a/browser/resources/settings/brave_routes.ts b/browser/resources/settings/brave_routes.ts index 73e529792fbd..83049be0fe33 100644 --- a/browser/resources/settings/brave_routes.ts +++ b/browser/resources/settings/brave_routes.ts @@ -55,12 +55,7 @@ export default function addBraveRoutes(r: Partial) { r.BRAVE_WALLET_NETWORKS = r.BRAVE_WALLET.createChild('/wallet/networks') } r.BRAVE_NEW_TAB = r.BASIC.createSection('/newTab', 'newTab') - if (r.SITE_SETTINGS_SITE_DETAILS) { - r.BRAVE_SITE_SETTINGS_COOKIES_DETAILS = - r.SITE_SETTINGS_SITE_DETAILS.createChild('/cookies/detail') - } else if (!isGuest) { - console.error('[Brave Settings Overrides] could not find expected route /content/siteDetails') - } + if (pageVisibility.leoAssistant) { r.BRAVE_LEO_ASSISTANT = r.BASIC.createSection('/leo-assistant', 'leoAssistant') diff --git a/browser/resources/settings/brave_site_details/brave_site_details.ts b/browser/resources/settings/brave_site_details/brave_site_details.ts deleted file mode 100644 index f34c2e384de4..000000000000 --- a/browser/resources/settings/brave_site_details/brave_site_details.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -import {SiteDetailsElement} from '../site_settings/site_details.js' -import {Router} from '../router.js'; -import {routes} from '../route.js'; - -// Extend SiteDetailsElement to add navigation to cookies subpage. -export class BraveSiteDetailsElement extends SiteDetailsElement { - onCookiesDetailClicked_ () { - const site = Router.getInstance().getQueryParameters().get('site'); - if (!site) { - return; - } - const searchParams = new URLSearchParams( - 'site=' + - (new URL(site)).host); - Router.getInstance().navigateTo(routes.BRAVE_SITE_SETTINGS_COOKIES_DETAILS, - searchParams); - } -} diff --git a/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.html b/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.html deleted file mode 100644 index f4e8961cc8f3..000000000000 --- a/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.html +++ /dev/null @@ -1,44 +0,0 @@ - - diff --git a/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.ts b/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.ts deleted file mode 100644 index 2b9a89b835ed..000000000000 --- a/browser/resources/settings/brave_site_settings/brave_site_data_details_subpage.ts +++ /dev/null @@ -1,182 +0,0 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -// Based on Chromium code subject to the following license: -// Copyright 2015 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js'; -import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; -import 'chrome://resources/cr_elements/cr_shared_style.css.js'; -import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js'; -import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js'; -import '../settings_shared.css.js'; - -import '//resources/js/cr.js'; - -import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js' -import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js' - -import {loadTimeData} from '../i18n_setup.js'; -import {MetricsBrowserProxyImpl, PrivacyElementInteractions} from '../metrics_browser_proxy.js'; -import {routes} from '../route.js'; -import {Route, RouteObserverMixin, RouteObserverMixinInterface, Router} from '../router.js'; - -import {CookieDataForDisplay, CookieDetails, getCookieData} from './cookie_info.js'; -import {LocalDataBrowserProxy, LocalDataBrowserProxyImpl} from './local_data_browser_proxy.js'; -import {getTemplate} from './brave_site_data_details_subpage.html.js'; - - -const categoryLabels: {[key: string]: string} = { - cache_storage: loadTimeData.getString('cookieCacheStorage'), - database: loadTimeData.getString('cookieDatabaseStorage'), - file_system: loadTimeData.getString('cookieFileSystem'), - flash_lso: loadTimeData.getString('cookieFlashLso'), - indexed_db: loadTimeData.getString('cookieDatabaseStorage'), - local_storage: loadTimeData.getString('cookieLocalStorage'), - service_worker: loadTimeData.getString('cookieServiceWorker'), - shared_worker: loadTimeData.getString('cookieSharedWorker'), - quota: loadTimeData.getString('cookieQuotaStorage'), -}; - -/** - * 'brave-site-data-details-subpage' Display cookie contents. - * Restore removed from Chromium site data details subpage - * https://chromium.googlesource.com/chromium/src/+/ - * 22ecdb41cdc603d40b47f92addcd52933fdef445/chrome/browser/resources/settings/ - * site_settings/site_data_details_subpage.js - */ - -const SiteDataDetailsSubpageElementBase = - RouteObserverMixin(WebUiListenerMixin(PolymerElement)) as { - new (): PolymerElement & WebUiListenerMixinInterface & - RouteObserverMixinInterface, - }; - -export class BraveSiteDataDetailsSubpageElement extends - SiteDataDetailsSubpageElementBase { - static get is() { - return 'brave-site-data-details-subpage'; - } - - static get template() { - return getTemplate(); - } - - static get properties() { - return { - /** - * The cookie entries for the given site. - */ - entries_: Array, - - /** Set the page title on the settings-subpage parent. */ - pageTitle: { - type: String, - notify: true, - }, - - site_: String, - }; - } - - private entries_: Array; - pageTitle: string; - private site_: string; - private browserProxy_: LocalDataBrowserProxy = - LocalDataBrowserProxyImpl.getInstance(); - - override ready() { - super.ready(); - this.addWebUiListener( - 'on-tree-item-removed', () => this.getCookieDetails_()); - } - - /** - * RouteObserverMixin - */ - override currentRouteChanged(route: Route) { - if (route !== routes.BRAVE_SITE_SETTINGS_COOKIES_DETAILS) { - return; - } - const site = Router.getInstance().getQueryParameters().get('site'); - if (!site) { - return; - } - this.site_ = site; - this.pageTitle = loadTimeData.getStringF('siteSettingsCookieSubpage', site); - this.getCookieDetails_(); - } - - private getCookieDetails_() { - if (!this.site_) { - return; - } - this.browserProxy_.getCookieDetails(this.site_) - .then( - (cookies: CookieDetails[]) => this.onCookiesLoaded_(cookies), - () => this.onCookiesLoadFailed_()); - } - - private getCookieNodes_(node: CookieDetails): CookieDataForDisplay[] { - return getCookieData(node); - } - - private onCookiesLoaded_(cookies: CookieDetails[]) { - this.entries_ = cookies.map(c => { - // Set up flag for expanding cookie details. - (c as CookieDetails & {expanded_: boolean}).expanded_ = false; - return c; - }) as Array; - } - - /** - * The site was not found. E.g. The site data may have been deleted or the - * site URL parameter may be mistyped. - */ - private onCookiesLoadFailed_() { - this.entries_ = []; - } - - /** - * Retrieves a string description for the provided |item|. - */ - private getEntryDescription_(item: CookieDetails): string { - // Frequently there are multiple cookies per site. To avoid showing a list - // of '1 cookie', '1 cookie', ... etc, it is better to show the title of the - // cookie to differentiate them. - if (item.type === 'cookie') { - return item.title; - } - return categoryLabels[item.type]; - } - - /** - * A handler for when the user opts to remove a single cookie. - */ - private onRemove_(event: Event) { - this.browserProxy_.removeItem( - (event.currentTarget as HTMLElement).dataset['idPath']!); - } - - /** - * A handler for when the user opts to remove all cookies. - */ - removeAll() { - MetricsBrowserProxyImpl.getInstance().recordSettingsPageHistogram( - PrivacyElementInteractions.COOKIE_DETAILS_REMOVE_ALL); - this.browserProxy_.removeSite(this.site_); - } -} - -declare global { - interface HTMLElementTagNameMap { - 'brave-site-data-details-subpage': BraveSiteDataDetailsSubpageElement; - } -} - -customElements.define( - BraveSiteDataDetailsSubpageElement.is, BraveSiteDataDetailsSubpageElement); diff --git a/browser/resources/settings/brave_site_settings/cookie_info.ts b/browser/resources/settings/brave_site_settings/cookie_info.ts deleted file mode 100644 index fe2ce52bf4b4..000000000000 --- a/browser/resources/settings/brave_site_settings/cookie_info.ts +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -// Based on Chromium code subject to the following license: -// Copyright 2016 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// clang-format off -import {loadTimeData} from '../i18n_setup.js'; -// clang-format on - -export interface CookieDetails { - hasChildren: boolean; - id: string; - idPath: string; - title: string; - totalUsage: string; - type: string; -} - -export interface CookieDataForDisplay { - content: string; - label: string; -} - -// This structure maps the various cookie type names from C++ (hence the -// underscores) to arrays of the different types of data each has, along with -// the i18n name for the description of that data type. -// This structure serves three purposes: -// 1) to list what subset of the cookie data we want to show in the UI. -// 2) What order to show it in. -// 3) What user friendly label to prefix the data with. -export const cookieInfo: {[key: string]: string[][]} = { - 'cookie': [ - ['name', 'cookieName'], - ['content', 'cookieContent'], - ['domain', 'cookieDomain'], - ['path', 'cookiePath'], - ['sendfor', 'cookieSendFor'], - ['accessibleToScript', 'cookieAccessibleToScript'], - ['created', 'cookieCreated'], - ['expires', 'cookieExpires'], - ], - 'database': [ - ['origin', 'databaseOrigin'], - ['size', 'localStorageSize'], - ['modified', 'localStorageLastModified'], - ], - 'local_storage': [ - ['origin', 'localStorageOrigin'], - ['size', 'localStorageSize'], - ['modified', 'localStorageLastModified'], - ], - 'indexed_db': [ - ['origin', 'indexedDbOrigin'], - ['size', 'indexedDbSize'], - ['modified', 'indexedDbLastModified'], - ], - 'file_system': [ - ['origin', 'fileSystemOrigin'], - ['persistent', 'fileSystemPersistentUsage'], - ['temporary', 'fileSystemTemporaryUsage'], - ], - 'quota': [['origin', 'quotaOrigin'], ['totalUsage', 'quotaSize']], - 'service_worker': - [['origin', 'serviceWorkerOrigin'], ['size', 'serviceWorkerSize']], - 'shared_worker': - [['worker', 'sharedWorkerWorker'], ['name', 'sharedWorkerName']], - 'cache_storage': [ - ['origin', 'cacheStorageOrigin'], - ['size', 'cacheStorageSize'], - ['modified', 'cacheStorageLastModified'], - ], - 'flash_lso': [['domain', 'cookieDomain']], -}; - -/** - * Get cookie data for a given HTML node. - * @param data The contents of the cookie. - */ -export function getCookieData(data: CookieDetails): CookieDataForDisplay[] { - const out: CookieDataForDisplay[] = []; - const fields = cookieInfo[data.type]; - for (let i = 0; i < fields.length; i++) { - const field = fields[i]; - // Iterate through the keys found in |cookieInfo| for the given |type| - // and see if those keys are present in the data. If so, display them - // (in the order determined by |cookieInfo|). - const key = field[0]; - const value = (data as unknown as {[key: string]: string})[key]; - if (value.length > 0) { - const entry = { - label: loadTimeData.getString(field[1]), - content: value, - }; - out.push(entry); - } - } - return out; -} diff --git a/browser/resources/settings/brave_site_settings/local_data_browser_proxy.ts b/browser/resources/settings/brave_site_settings/local_data_browser_proxy.ts deleted file mode 100644 index ddddd3d77404..000000000000 --- a/browser/resources/settings/brave_site_settings/local_data_browser_proxy.ts +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -// Based on Chromium code subject to the following license: -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/** - * @fileoverview A helper object used from the Cookies and Local Storage Data - * section. - */ - -// clang-format off -import {sendWithPromise} from 'chrome://resources/js/cr.js'; -import {CookieDetails} from './cookie_info.js'; -// clang-format on - -export interface LocalDataItem { - localData: string; - site: string; -} - -export interface LocalDataBrowserProxy { - - /** - * Removes all local data (local storage, cookies, etc.). - * Note: on-tree-item-removed will not be sent. - */ - removeAll(): Promise; - - /** - * Remove data for a specific site. Completion signaled by - * on-tree-item-removed. - */ - removeSite(site: string): void; - - /** - * Gets the cookie details for a particular site. - */ - getCookieDetails(site: string): Promise; - - - /** - * Removes a given piece of site data. - * @param path The path to the item in the tree model. - */ - removeItem(path: string): void; -} - -export class LocalDataBrowserProxyImpl implements LocalDataBrowserProxy { - removeAll() { - return sendWithPromise('localData.removeAll'); - } - - removeSite(site: string) { - chrome.send('localData.removeSite', [site]); - } - - getCookieDetails(site: string) { - return sendWithPromise('localData.getCookieDetails', site); - } - - removeItem(path: string) { - chrome.send('localData.removeItem', [path]); - } - - static getInstance(): LocalDataBrowserProxy { - return instance || (instance = new LocalDataBrowserProxyImpl()); - } - - static setInstance(obj: LocalDataBrowserProxy) { - instance = obj; - } -} - -let instance: LocalDataBrowserProxy|null = null; diff --git a/browser/resources/settings/sources.gni b/browser/resources/settings/sources.gni index ff22f14ddb2f..bbb83ccca599 100644 --- a/browser/resources/settings/sources.gni +++ b/browser/resources/settings/sources.gni @@ -37,7 +37,6 @@ brave_settings_web_component_files = [ "brave_new_tab_page/brave_new_tab_page.ts", "brave_privacy_page/brave_personalization_options.ts", "brave_search_engines_page/brave_search_engines_page.ts", - "brave_site_settings/brave_site_data_details_subpage.ts", "brave_sync_page/brave_sync_code_dialog.ts", "brave_sync_page/brave_sync_configure.ts", "brave_sync_page/brave_sync_delete_account_dialog.ts", @@ -108,14 +107,10 @@ brave_settings_non_web_component_files = [ "brave_overrides/site_settings_page.ts", "brave_overrides/sync_account_control.ts", "brave_overrides/sync_controls.ts", - "brave_privacy_page/brave_privacy_page.ts", "brave_privacy_page/brave_privacy_page_browser_proxy.ts", "brave_reset_page/brave_reset_profile_dialog_behavior.ts", "brave_routes.ts", "brave_search_engines_page/brave_search_engines_page_browser_proxy.ts", - "brave_site_details/brave_site_details.ts", - "brave_site_settings/cookie_info.ts", - "brave_site_settings/local_data_browser_proxy.ts", "brave_sync_page/brave_sync_browser_proxy.ts", "brave_tor_page/brave_tor_browser_proxy.ts", "brave_wallet_page/brave_wallet_browser_proxy.ts", diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc index 605a17d98ccc..2a426edfbe00 100644 --- a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc +++ b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc @@ -730,11 +730,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, {"adblockSubscribeUrlUpdateFailed", IDS_BRAVE_ADBLOCK_SUBSCRIBE_URL_UPDATE_FAILED}, {"adblockCustomListsLabel", IDS_BRAVE_ADBLOCK_CUSTOM_LISTS_LABEL}, - {"siteCookiesLinkLabel", IDS_SETTINGS_SITE_COOKIES_LINK_TITLE}, - {"siteCookiesLinkDesc", IDS_SETTINGS_SITE_COOKIES_LINK_DESC}, - {"siteSettingsCookieSubpage", IDS_SETTINGS_SITE_SETTINGS_COOKIE_SUBPAGE}, - {"siteSettingsCookieRemoveAll", - IDS_SETTINGS_SITE_SETTINGS_COOKIES_REMOVE_ALL}, {"braveShortcutsPage", IDS_SETTINGS_BRAVE_SHORTCUTS_TITLE}, {"shortcutsPageSearchPlaceholder", IDS_SHORTCUTS_PAGE_SEARCH_PLACEHOLDER}, diff --git a/patches/chrome-browser-resources-settings-router.ts.patch b/patches/chrome-browser-resources-settings-router.ts.patch index bb691e6a3702..c0b2160423ac 100644 --- a/patches/chrome-browser-resources-settings-router.ts.patch +++ b/patches/chrome-browser-resources-settings-router.ts.patch @@ -6,7 +6,7 @@ index 259e80e8b6c34618bb5d1372c2760dfdf4aee7e4..147b2081d2a74daedb002004c825fc29 SYSTEM: Route; TRACKING_PROTECTION: Route; TRIGGERED_RESET_DIALOG: Route; -+ GET_STARTED: Route; SHIELDS: Route; SOCIAL_BLOCKING: Route; EXTENSIONS: Route; EXTENSIONS_V2: Route; BRAVE_SYNC: Route; BRAVE_SYNC_SETUP: Route; BRAVE_IPFS: Route; BRAVE_WALLET: Route; BRAVE_WEB3: Route; BRAVE_NEW_TAB: Route; THEMES: Route; BRAVE_SITE_SETTINGS_COOKIES_DETAILS: Route; ++ GET_STARTED: Route; SHIELDS: Route; SOCIAL_BLOCKING: Route; EXTENSIONS: Route; EXTENSIONS_V2: Route; BRAVE_SYNC: Route; BRAVE_SYNC_SETUP: Route; BRAVE_IPFS: Route; BRAVE_WALLET: Route; BRAVE_WEB3: Route; BRAVE_NEW_TAB: Route; THEMES: Route; } /** Class for navigable routes. */