Merge pull request #13080 from brave/1.38.x-de-amp-misc-fixes

Uplift - Misc fixes for DeAMP (#12999)
brave · Apr 22, 2022 · 2a4059e · 2a4059e
2 parents 0eb3146 + d3665fa
commit 2a4059e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
@@ -52,12 +52,6 @@
         sub-label="$i18n{statsUsagePingEnabledDesc}"
         on-settings-boolean-control-change="onStatsUsagePingEnabledChange_">
     </settings-toggle-button>
-    <settings-toggle-button
-        class="cr-row"
-        pref="{{prefs.brave.de_amp.enabled}}"
-        label="$i18n{deAmpSettingLabel}"
-        sub-label="$i18n{deAmpSettingSubLabel}">
-    </settings-toggle-button>
   </template>
   <script src="brave_personalization_options.js"></script>
 </dom-module>
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
@@ -56,6 +56,12 @@
         pref="{{prefs.brave.shields.stats_badge_visible}}"
         label="$i18n{showStatsBlockedBadgeLabel}">
     </settings-toggle-button>
+    <settings-toggle-button
+        class="cr-row"
+        pref="{{prefs.brave.de_amp.enabled}}"
+        label="$i18n{deAmpSettingLabel}"
+        sub-label="$i18n{deAmpSettingSubLabel}">
+    </settings-toggle-button>
     <div class="settings-box">
       <div class="start">$i18n{adControlLabel}</div>
       <select id="adControlType" class="md-select"

diff --git a/components/de_amp/browser/de_amp_util.cc b/components/de_amp/browser/de_amp_util.cc
@@ -18,11 +18,12 @@ namespace {
 // Check for "amp" or "⚡" in <html> 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