Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions patches/user-preferences.patch
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,18 @@ index d5079082c7..d75f6a430f 100644
<cr-link-row id="advanced-protection-program-link" class="hr"
label="$i18n{advancedProtectionProgramTitle}"
diff --git a/chrome/browser/resources/settings/privacy_page/security_page.ts b/chrome/browser/resources/settings/privacy_page/security_page.ts
index b101a4795d..4e5a110caf 100644
index b101a4795d..83c8252dd3 100644
--- a/chrome/browser/resources/settings/privacy_page/security_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
@@ -103,6 +103,19 @@ export class SettingsSecurityPageElement extends
@@ -28,6 +28,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu

import type {SettingsRadioGroupElement} from '../controls/settings_radio_group.js';
import type {SettingsToggleButtonElement} from '../controls/settings_toggle_button.js';
+import type {DropdownMenuOptionList} from '../controls/settings_dropdown_menu.js';
import type {FocusConfig} from '../focus_config.js';
import {HatsBrowserProxyImpl, SecurityPageInteraction} from '../hats_browser_proxy.js';
import {loadTimeData} from '../i18n_setup.js';
@@ -103,6 +104,19 @@ export class SettingsSecurityPageElement extends
},
// </if>

Expand All @@ -129,7 +137,7 @@ index b101a4795d..4e5a110caf 100644
/**
* Whether the secure DNS setting should be displayed.
*/
@@ -250,6 +263,7 @@ export class SettingsSecurityPageElement extends
@@ -250,6 +264,7 @@ export class SettingsSecurityPageElement extends
// <if expr="chrome_root_store_cert_management_ui">
private enableCertManagementUIV2_: boolean;
// </if>
Expand Down