Move Auto Open Downloads block into neon-animatable tag

This change fixes a https://crbug.com/851937 where users are unable to
clear auto-opening downloads settings.

Bug: chromium:851937
Test: verified manually
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I263ef9497a8a9b298a3514404fc3f31a61393687
Reviewed-on: https://chromium-review.googlesource.com/1099693Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567299}

chrome/browser/resources/settings/downloads_page/downloads_page.html

@@ -21,70 +21,69 @@
   <settings-animated-pages id="pages" section="downloads"
       focus-config="[[focusConfig_]]">
     <neon-animatable route-path="default">
-    <div class="settings-box first two-line">
-      <div class="start">
-        <div>$i18n{downloadLocation}</div>
-        <div class="secondary">
+      <div class="settings-box first two-line">
+        <div class="start">
+          <div>$i18n{downloadLocation}</div>
+          <div class="secondary">
 <if expr="not chromeos">
-          [[prefs.download.default_directory.value]]
+            [[prefs.download.default_directory.value]]
 </if>
 <if expr="chromeos">
-          [[getDownloadLocation_(prefs.download.default_directory.value)]]
+            [[getDownloadLocation_(prefs.download.default_directory.value)]]
 </if>
+          </div>
         </div>
+        <div class="separator"></div>
+        <controlled-button class="secondary-button" id="changeDownloadsPath"
+            label="$i18n{changeDownloadLocation}"
+            on-click="selectDownloadLocation_"
+            pref="[[prefs.download.default_directory]]"
+            end-justified>
+        </controlled-button>
       </div>
-      <div class="separator"></div>
-      <controlled-button class="secondary-button" id="changeDownloadsPath"
-          label="$i18n{changeDownloadLocation}"
-          on-click="selectDownloadLocation_"
-          pref="[[prefs.download.default_directory]]"
-          end-justified>
-      </controlled-button>
-    </div>
-    <settings-toggle-button
-        pref="{{prefs.download.prompt_for_download}}"
-        label="$i18n{promptForDownload}">
-    </settings-toggle-button>
-<if expr="chromeos">
-    <settings-toggle-button class="continuation"
-        pref="{{prefs.gdata.disabled}}"
-        label="$i18n{disconnectGoogleDriveAccount}"
-        hidden="[[!pageVisibility.googleDrive]]">
-    </settings-toggle-button>
-</if>
+      <settings-toggle-button
+          pref="{{prefs.download.prompt_for_download}}"
+          label="$i18n{promptForDownload}">
+      </settings-toggle-button>
 <if expr="chromeos">
-  <template is="dom-if" if="[[enableSmbSettings_]]">
-    <div id="smbShares" class="settings-box"
-        on-click="onTapSmbShares_" actionable>
-      <div class="start"> $i18n{smbSharesTitle} </div>
-      <paper-icon-button-light class="subpage-arrow">
-        <button aria-label="$i18n{smbSharesTitle}"></button>
-      </paper-icon-button-light>
-    </div>
-  </template>
+      <settings-toggle-button class="continuation"
+          pref="{{prefs.gdata.disabled}}"
+          label="$i18n{disconnectGoogleDriveAccount}"
+          hidden="[[!pageVisibility.googleDrive]]">
+      </settings-toggle-button>
+      <template is="dom-if" if="[[enableSmbSettings_]]">
+        <div id="smbShares" class="settings-box"
+            on-click="onTapSmbShares_" actionable>
+          <div class="start"> $i18n{smbSharesTitle} </div>
+          <paper-icon-button-light class="subpage-arrow">
+            <button aria-label="$i18n{smbSharesTitle}"></button>
+          </paper-icon-button-light>
+        </div>
+      </template>
 </if>
-</neon-animatable>
-    <template is="dom-if" if="[[autoOpenDownloads_]]" restamp>
-      <div class="settings-box">
-        <div class="start">
-          $i18n{openFileTypesAutomatically}
+      <template is="dom-if" if="[[autoOpenDownloads_]]" restamp>
+        <div class="settings-box">
+          <div class="start">
+            $i18n{openFileTypesAutomatically}
+          </div>
+          <div class="separator"></div>
+          <paper-button id="resetAutoOpenFileTypes" class="secondary-button"
+              on-click="onClearAutoOpenFileTypesTap_">
+            $i18n{clear}
+          </paper-button>
         </div>
-        <div class="separator"></div>
-        <paper-button id="resetAutoOpenFileTypes" class="secondary-button"
-            on-click="onClearAutoOpenFileTypesTap_">
-          $i18n{clear}
-        </paper-button>
-      </div>
-    </template>
-<if expr="chromeos">
-      <template is="dom-if" route-path="/smbShares">
-        <settings-subpage
-            associated-control="[[$$('#smbShares')]]"
-            page-title="$i18n{smbSharesTitle}">
-          <settings-smb-shares-page>
-          </settings-smb-shares-page>
-        </settings-subpage>
       </template>
+    </neon-animatable>
+
+<if expr="chromeos">
+    <template is="dom-if" route-path="/smbShares">
+      <settings-subpage
+          associated-control="[[$$('#smbShares')]]"
+          page-title="$i18n{smbSharesTitle}">
+        <settings-smb-shares-page>
+        </settings-smb-shares-page>
+      </settings-subpage>
+    </template>
 </if>
   </settings-animated-pages>
   </template>