Skip to content

Commit 392486d

Browse files
authored
fix: missed changes and UI bugs for 148 (#715)
1 parent ddfcc6c commit 392486d

3 files changed

Lines changed: 38 additions & 3 deletions

File tree

patches/dns-providers.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ index 386c76b3c8..eaaec51147 100644
4444
"2606:4700:4700::1003"},
4545
{"family.cloudflare-dns.com"},
4646
"https://family.cloudflare-dns.com/dns-query",
47-
/*ui_name=*/"",
47+
- /*ui_name=*/"",
48+
+ /*ui_name=*/"Cloudflare Family (1.1.1.3)",
4849
/*privacy_policy=*/"",
4950
- /*display_globally=*/false,
5051
+ /*display_globally=*/true,
@@ -60,7 +61,8 @@ index 386c76b3c8..eaaec51147 100644
6061
"2606:4700:4700::1002"},
6162
{"security.cloudflare-dns.com"},
6263
"https://security.cloudflare-dns.com/dns-query",
63-
/*ui_name=*/"",
64+
- /*ui_name=*/"",
65+
+ /*ui_name=*/"Cloudflare Security (1.1.1.2)",
6466
/*privacy_policy=*/"",
6567
+ /*display_globally=*/true,
6668
+ /*display_countries=*/{},

patches/ui_patches/hide-privacy-intrusive-prefs.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,18 @@ index 220bfa52fa..076c4ec3dc 100644
4646
label="$i18n{importTitle}"
4747
on-click="onImportDataClick_"></cr-link-row>
4848
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
49-
index 19aebba1df..8e5c62ff84 100644
49+
index 19aebba1df..45d59b65ec 100644
5050
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
5151
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
52+
@@ -346,7 +346,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
53+
bool show_privacy_guide =
54+
base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) ||
55+
(!ShouldDisplayManagedUi(profile) && !profile->IsChild());
56+
- html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
57+
+ html_source->AddBoolean("showPrivacyGuide", false);
58+
59+
html_source->AddBoolean(
60+
"showResetProfileBannerV2",
5261
@@ -510,7 +510,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
5362
base::FeatureList::IsEnabled(privacy_sandbox::kRelatedWebsiteSetsUi));
5463
html_source->AddBoolean("isPrivacySandboxAdPrivacyUxDeprecationEnabled",

patches/ui_patches/hide-useless-prefs.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@ Unless required by applicable law or agreed to in writing, software distributed
1010
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
See the License for the specific language governing permissions and limitations under the License.
1212
---
13+
diff --git a/chrome/browser/resources/settings/site_settings/v8_page.html b/chrome/browser/resources/settings/site_settings/v8_page.html
14+
index 3e6101bb07..50a7b6ec05 100644
15+
--- a/chrome/browser/resources/settings/site_settings/v8_page.html
16+
+++ b/chrome/browser/resources/settings/site_settings/v8_page.html
17+
@@ -25,19 +25,6 @@
18+
sub-label="$i18n{siteSettingsJavascriptOptimizerAllowedSubLabel}"
19+
no-collapse>
20+
</settings-collapse-radio-button>
21+
- <template is="dom-if"
22+
- if="[[enableBlockV8OptimizerOnUnfamiliarSites_]]">
23+
- <settings-collapse-radio-button
24+
- id="blockForUnfamiliarSites"
25+
- class="two-line"
26+
- name="[[javascriptOptimizerSettingEnum_.BLOCKED_FOR_UNFAMILIAR_SITES]]"
27+
- pref="[[prefs.generated.javascript_optimizer]]"
28+
- label="$i18n{siteSettingsJavascriptOptimizerBlockedUnfamiliarSites}"
29+
- sub-label="[[getBlockForUnfamiliarSitesSubLabel_(
30+
- prefs.generated.javascript_optimizer.value)]]"
31+
- no-collapse>
32+
- </settings-collapse-radio-button>
33+
- </template>
34+
<settings-collapse-radio-button
35+
id="blockForAllSites"
36+
class="two-line"
1337
diff --git a/chrome/browser/resources/settings/a11y_page/live_translate.html b/chrome/browser/resources/settings/a11y_page/live_translate.html
1438
index 3fce5bc069..c8ce8d033c 100644
1539
--- a/chrome/browser/resources/settings/a11y_page/live_translate.html

0 commit comments

Comments
 (0)