Index: chrome/browser/resources/settings/reset_page/reset_page.html |
diff --git a/chrome/browser/resources/settings/reset_page/reset_page.html b/chrome/browser/resources/settings/reset_page/reset_page.html |
index 211a0b8ef458866b16c2e26d26329170e2bf6a67..ac28aae42842f56fe9811ce20039499d15362961 100644 |
--- a/chrome/browser/resources/settings/reset_page/reset_page.html |
+++ b/chrome/browser/resources/settings/reset_page/reset_page.html |
@@ -3,6 +3,7 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html"> |
<dom-module id="settings-reset-page"> |
<link rel="import" type="css" |
@@ -14,14 +15,15 @@ |
<div i18n-content="resetPageDescription"></div> |
</div> |
- <paper-dialog modal id="resetDialog" class="layout vertical"> |
- <div id="top" class="layout vertical"> |
+ <paper-dialog modal id="resetDialog"> |
+ <div> |
<h2 i18n-content="resetPageTitle"></h2> |
<div i18n-content="resetPageExplanation" id="explanation"></div> |
<div class="layout center horizontal" id="buttonContainer"> |
<paper-button on-tap="onLearnMoreTap_" id="learnMore" |
i18n-content="learnMore"></paper-button> |
- <div class="buttons flex-1"> |
+ <div class="layout center buttons flex-1"> |
+ <paper-spinner id="resetSpinner"></paper-spinner> |
<paper-button on-tap="onCancelTap_" id="cancel" |
i18n-content="cancel"></paper-button> |
<paper-button i18n-content="resetPageCommit" on-tap="onResetTap_" |
@@ -29,8 +31,15 @@ |
</div> |
</div> |
</div> |
- <paper-checkbox id="sendSettings" i18n-content="resetPageFeedback" |
- checked></paper-checkbox> |
+ <div id="feedbackBar"> |
+ <paper-checkbox id="sendSettings" i18n-content="resetPageFeedback" |
+ checked on-change="onSendSettingsChange_"></paper-checkbox> |
+ <div id="settings"> |
+ <template is="dom-repeat" items="[[feedbackInfo_]]"> |
+ <div><span>[[item.key]]</span>: <span>[[item.value]]</span></div> |
+ </template> |
+ </div> |
+ </div> |
</paper-dialog> |
</template> |