[merge to m59]md settings: Fix dialog buttons on lock screen.

chrome/browser/resources/settings/people_page/setup_fingerprint_dialog.html

 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="fingerprint_browser_proxy.html">
@@ skipping 54 matching lines @@
         </settings-fingerprint-progress-arc>
         <div id="imageDiv">
           <iron-icon id="image" icon="settings:fingerprint" step$="[[step_]]">
           </iron-icon>
         </div>
         <div id="problemDiv" class="settings-box first"
             invisible$="[[!problemMessage_]]">
           <iron-icon icon="settings:warning"></iron-icon>
           <span class="middle">[[problemMessage_]]</span>
         </div>
+      </div>
+      <div class="button-container">
+        <paper-button id="addAnotherButton" on-tap="onAddAnotherFingerprint_"
+            hidden$="[[hideAddAnother_(step_)]]">
+          $i18n{configureFingerprintAddAnotherButton}
+        </paper-button>
 
-        <div class="button-strip">
-          <paper-button id="addAnotherButton" on-tap="onAddAnotherFingerprint_"
-              hidden$="[[hideAddAnother_(step_)]]">
-            $i18n{configureFingerprintAddAnotherButton}
-          </paper-button>
-
-          <paper-button id="closeButton"
-              class$="[[getCloseButtonClass_(step_)]]" on-tap="onClose_">
-            [[getCloseButtonText_(step_)]]
-          </paper-button>
-        </div>
+        <paper-button id="closeButton"
+            class$="[[getCloseButtonClass_(step_)]]" on-tap="onClose_">
+          [[getCloseButtonText_(step_)]]
+        </paper-button>
       </div>
     </dialog>
   </template>
 
   <script src="setup_fingerprint_dialog.js"></script>
 </dom-module>