[MD settings] move adobe storage settings button out of site-settings-category

This CL moves a button that is only shown in the plugins category to
the instantiation of that category. That helps clean up the
site-settings-category page. This also changes the cookies-control
selector to an extra-options selector that is shared with the adobe
storage settings button.

BUG=None
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2563893002
Cr-Commit-Position: refs/heads/master@{#437638}

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

@@ -251,7 +251,7 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.COOKIES}}">
-            <div class="settings-box cookie-controls">
+            <div class="settings-box extra-options">
               <settings-toggle-button class="start"
                   label="$i18n{thirdPartyCookie}"
                   sub-label="$i18n{thirdPartyCookieSublabel}"
@@ -345,6 +345,12 @@
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.PLUGINS}}">
+<if expr="chromeos">
+            <div actionable class="settings-box extra-options"
+                on-tap="onAdobeFlashStorageClicked_">
+              <div class="list-item list-button">$i18n{adobeFlashStorage}</div>
+            </div>
+</if>
           </site-settings-category>
         </settings-subpage>
       </template>

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -165,4 +165,12 @@ Polymer({
         loadTimeData.getString('siteSettings') :
         loadTimeData.getString('contentSettings');
   },
+
+<if expr="chromeos">
+  /** @private */
+  onAdobeFlashStorageClicked_: function() {
+    window.open('https://www.macromedia.com/support/' +
+        'documentation/en/flashplayer/help/settings_manager07.html');
+  },
+</if>
 });

chrome/browser/resources/settings/site_settings/site_settings_category.html

@@ -54,18 +54,7 @@
       </div>
     </template>
 
-    <content select=".cookie-controls"></content>
-
-<if expr="chromeos">
-    <div class="settings-box layout horizontal">
-      <div class="flex" hidden$="[[!isPluginCategory_(category)]]">
-          <div class="list-item list-button"
-              on-tap="onAdobeFlashStorageClicked_">
-            $i18n{adobeFlashStorage}
-          </div>
-      </div>
-    </div>
-</if>
+    <content select=".extra-options"></content>
 
     <site-list
         category="[[category]]"

chrome/browser/resources/settings/site_settings/site_settings_category.js

@@ -183,20 +183,4 @@ Polymer({
   isCookiesCategory_: function(category) {
     return category == settings.ContentSettingsTypes.COOKIES;
   },
-
-  /**
-   * Returns whether this is the Plugins category.
-   * @param {string} category The current category.
-   * @return {boolean} Whether this is the Plugins category.
-   * @private
-   */
-  isPluginCategory_: function(category) {
-    return category == settings.ContentSettingsTypes.PLUGINS;
-  },
-
-  /** @private */
-  onAdobeFlashStorageClicked_: function() {
-    window.open('https://www.macromedia.com/support/' +
-        'documentation/en/flashplayer/help/settings_manager07.html');
-  },
 });