diff --git a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html index 0e25b302314f..0114cfe2c087 100644 --- a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html +++ b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html @@ -54,12 +54,6 @@ sub-label="$i18n{statsUsagePingEnabledDesc}" on-settings-boolean-control-change="onStatsUsagePingEnabledChange_"> - - diff --git a/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.html b/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.html index 6b029de453b2..4e9655888f3a 100644 --- a/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.html +++ b/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.html @@ -56,6 +56,18 @@ pref="{{prefs.brave.shields.stats_badge_visible}}" label="$i18n{showStatsBlockedBadgeLabel}"> + + + +
$i18n{adControlLabel}
- - diff --git a/components/de_amp/browser/de_amp_util.cc b/components/de_amp/browser/de_amp_util.cc index 4b747c754067..50731f977fa3 100644 --- a/components/de_amp/browser/de_amp_util.cc +++ b/components/de_amp/browser/de_amp_util.cc @@ -14,11 +14,12 @@ namespace { // Check for "amp" or "⚡" in tag // https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/?format=websites#ampd constexpr char kGetHtmlTagPattern[] = "(<\\s*?html\\s.*?>)"; -constexpr char kDetectAmpPattern[] = "(?:<.*\\s.*(amp|⚡)(?:\\s.*>|>|/>))"; +constexpr char kDetectAmpPattern[] = + "(?:<.*?\\s.*?(amp|⚡|amp=\"\\s*\"|amp='\\s*')(?:\\s.*?>|>|/>))"; // Look for canonical link tag and get href // https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/?format=websites#canon constexpr char kFindCanonicalLinkTagPattern[] = - "(<\\s*link\\s[^>]*rel=(?:\"|')canonical(?:\"|')(?:\\s[^>]*>|>|/>))"; + "(<\\s*?link\\s[^>]*?rel=(?:\"|')canonical(?:\"|')(?:\\s[^>]*?>|>|/>))"; constexpr char kFindCanonicalHrefInTagPattern[] = "href=(?:\"|')(.*?)(?:\"|')"; } // namespace