[MD settings] move extra options in category settings

chrome/browser/resources/settings/privacy_page/privacy_page.html

Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 719cf29723f9121d832c33d31a4fee7fbb78a180..7305291bd5bd036964836599a2aeb17816621a58 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -14,6 +14,7 @@
 <link rel="import" href="/settings_page/settings_subpage.html">
 <link rel="import" href="/settings_shared_css.html">
 <link rel="import" href="/site_settings/all_sites.html">
+<link rel="import" href="/site_settings/category_default.html">
 <link rel="import" href="/site_settings/constants.html">
 <link rel="import" href="/site_settings/media_picker.html">
 <link rel="import" href="/site_settings/pdf_documents.html">
@@ -219,6 +220,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
+            <category-default class="category-default"

[tommycli, 2016/12/09 00:13:19]

I see that each of these has the class="category-default". What's the reason?

[dschuyler, 2016/12/13 23:57:38]

The category-default holds those top one or two toggles that enable/disable the
category. 

+                category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -230,6 +234,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -241,6 +248,9 @@
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.CAMERA}}">
             <media-picker type="camera" class="media-picker"></media-picker>
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.CAMERA}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -251,7 +261,12 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.COOKIES}}">
-            <div class="settings-box cookie-controls">
+            <category-default class="category-default"

[tommycli, 2016/12/09 00:13:19]

Does every single site-settings-category node have a category-default as a child
element?

If so - I would recommend just making category-default part of
site-settings-category. You can pass in the extra options such as
sub-option-label and sub-option-secondary as attributes of
site-settings-category.

That would also allow you to avoid the one-off differences per data type.

I see you also sometimes need to put some extra controls either before OR after
the main controls.

In that case I suggest using
https://www.polymer-project.org/1.0/docs/devguide/local-dom#dom-distribution

So the template of site-settings-category might look like:

<template>
  <content select=".before-default-controls"></content>

  <!-- All the controls within category-default here -->

  <content select=".after-default-controls"></content>
</template>

[dschuyler, 2016/12/13 23:57:38]

The intent of the CL is to move the bits that are specific to different
categories out of the general site-settings-category page. I can consider other
ways to achieve that.

+                category="{{ContentSettingsTypes.COOKIES}}"
+                sub-option-label="$i18n{deleteDataPostSession}"
+                sub-option-secondary=""><!-- To work with :empty. -->
+            </category-default>
+            <div class="settings-box extra-options">
               <settings-toggle-button class="start"
                   label="$i18n{thirdPartyCookie}"
                   sub-label="$i18n{thirdPartyCookieSublabel}"
@@ -269,6 +284,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.IMAGES}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.IMAGES}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -279,6 +297,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.GEOLOCATION}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.GEOLOCATION}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -304,6 +325,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.JAVASCRIPT}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.JAVASCRIPT}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -314,6 +338,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.KEYGEN}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.KEYGEN}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -325,6 +352,9 @@
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.MIC}}">
             <media-picker type="mic" class="media-picker"></media-picker>
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.MIC}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -335,6 +365,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.NOTIFICATIONS}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.NOTIFICATIONS}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -345,6 +378,22 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.PLUGINS}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.PLUGINS}}"
+                sub-option-label="$i18n{siteSettingsFlashAskBefore}"
+                sub-option-secondary=
+                    "$i18n{siteSettingsFlashAskBeforeSubtitle}">
+            </category-default>
+<if expr="chromeos">

[tommycli, 2016/12/09 00:13:19]

May be cleaner to add this link in separate CL.

[dschuyler, 2016/12/13 23:57:38]

Done.

+            <div class="settings-box layout horizontal extra-options">
+              <div class="flex">

[tommycli, 2016/12/09 00:13:19]

Can this flex class be consolidated into the parent div. In other words, do we
need the extra div?

[dschuyler, 2016/12/13 23:57:38]

I was trying to avoid making edits to the code I was moving, but this does seem
like a simple change.

Done in a separate CL.

+                  <div class="list-item list-button"
+                      on-tap="onAdobeFlashStorageClicked_">
+                    $i18n{adobeFlashStorage}
+                  </div>
+              </div>
+            </div>
+</if>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -355,6 +404,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.POPUPS}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.POPUPS}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>
@@ -365,6 +417,9 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
+            <category-default class="category-default"
+                category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
+            </category-default>
           </site-settings-category>
         </settings-subpage>
       </template>