Remove background sync content settings

Fix brave/brave-browser#366
brave · Aug 20, 2018 · 9924e10 · 9924e10
1 parent 627920b
commit 9924e10
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/browser/resources/settings/settings_resources.grd b/browser/resources/settings/settings_resources.grd
@@ -335,7 +335,7 @@
       <structure name="IDR_SETTINGS_SITE_SETTINGS_BEHAVIOR_JS" file="site_settings/site_settings_behavior.js" type="chrome_html" preprocess="true" />
       <structure name="IDR_SETTINGS_CONSTANTS_JS" file="site_settings/constants.js" type="chrome_html" />
       <structure name="IDR_SETTINGS_CONSTANTS_HTML" file="site_settings/constants.html" type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML" file="site_settings_page/site_settings_page.html" type="chrome_html" />
+      <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML" file="site_settings_page/site_settings_page.html" type="chrome_html" preprocess="true" />
       <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS" file="site_settings_page/site_settings_page.js" type="chrome_html" preprocess="true" />
       <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML" file="site_settings/site_settings_prefs_browser_proxy.html" type="chrome_html" />
       <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS" file="site_settings/site_settings_prefs_browser_proxy.js" preprocess="true" type="chrome_html" />

diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
-index 92c863fcf9ead0637947b1ed4004ab85d1d23346..7767f7ee49d8e1ba4012a25ec049661f989f2a5c 100644
+index 92c863fcf9ead0637947b1ed4004ab85d1d23346..9c8f66db21836a5172f909c4cdd28990980e1f46 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
 @@ -147,6 +147,25 @@
@@ -28,3 +28,19 @@ index 92c863fcf9ead0637947b1ed4004ab85d1d23346..7767f7ee49d8e1ba4012a25ec049661f
      <div id="javascript" class="settings-box two-line"
          category$="[[ContentSettingsTypes.JAVASCRIPT]]"
          data-route="SITE_SETTINGS_JAVASCRIPT" on-click="onTapNavigate_"
+@@ -241,6 +260,7 @@
+         </paper-icon-button-light>
+       </div>
+     </template>
++<if expr="_google_chrome">
+     <div id="background-sync" class="settings-box two-line"
+         category$="[[ContentSettingsTypes.BACKGROUND_SYNC]]"
+         data-route="SITE_SETTINGS_BACKGROUND_SYNC" on-click="onTapNavigate_"
+@@ -260,6 +280,7 @@
+             aria-describedby="backgroundSyncSecondary"></button>
+       </paper-icon-button-light>
+     </div>
++</if>
+     <template is="dom-if" if="[[enableSoundContentSetting_]]">
+       <div id="sound" class="settings-box two-line"
+           category$="[[ContentSettingsTypes.SOUND]]"
diff --git a/script/chromium-rebase-l10n.py b/script/chromium-rebase-l10n.py
@@ -38,6 +38,8 @@ def main():
     elem1.set('preprocess', 'true')
     elem2 = xml_tree.xpath('//structure[@name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"]')[0]
     elem2.set('preprocess', 'true')
+    elem3 = xml_tree.xpath('//structure[@name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"]')[0]
+    elem3.set('preprocess', 'true')
     brave_page_visibility_element_len = len(xml_tree.xpath('//structure[@name="IDR_SETTINGS_BRAVE_PAGE_VISIBILITY_JS"]'))
     if brave_page_visibility_element_len == 0:
         brave_page_visibility_element = etree.Element('structure')