Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 2 <link rel="import" href="chrome://resources/html/action_link.html"> | 2 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 9 <link rel="import" href="/reset_page/reset_browser_proxy.html"> | 9 <link rel="import" href="/reset_page/reset_browser_proxy.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| 11 | 11 |
| 12 <dom-module id="settings-reset-profile-dialog"> | 12 <dom-module id="settings-reset-profile-dialog"> |
| 13 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> | 13 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> |
| 14 <template> | 14 <template> |
| 15 <style include="settings-shared"> | 15 <style include="settings-shared"> |
| 16 .footer a { | 16 .footer a { |
| 17 color: rgb(66, 133, 244); | 17 color: rgb(66, 133, 244); |
| 18 text-decoration: none; | 18 text-decoration: none; |
| 19 vertical-align: middle; | 19 vertical-align: middle; |
| 20 } | 20 } |
| 21 | |
| 22 paper-spinner { | |
| 23 margin: 0 8px; | |
| 24 } | |
| 21 </style> | 25 </style> |
| 22 <dialog is="cr-dialog" id="dialog"> | 26 <dialog is="cr-dialog" id="dialog"> |
| 23 <div class="title">$i18n{resetPageTitle}</div> | 27 <div class="title">$i18n{resetPageTitle}</div> |
| 24 <div class="body"> | 28 <div class="body"> |
| 25 <span> | 29 <span> |
| 26 $i18n{resetPageExplanation} | 30 $i18n{resetPageExplanation} |
| 27 <a href="$i18nRaw{resetPageLearnMoreUrl}" target="_blank"> | 31 <a href="$i18nRaw{resetPageLearnMoreUrl}" target="_blank"> |
| 28 $i18n{learnMore} | 32 $i18n{learnMore} |
| 29 </a> | 33 </a> |
| 30 </span> | 34 </span> |
| 31 </div> | 35 </div> |
| 32 <div class="button-container"> | 36 <div class="button-container"> |
| 33 <paper-spinner id="resetSpinner" active="[[clearingInProgress_]]"> | 37 <paper-spinner id="resetSpinner" active="[[clearingInProgress_]]"> |
|
Dan Beam
2016/09/15 21:15:40
is this spinner the right size? it looks too big
dpapad
2016/09/20 00:52:36
See http://imgur.com/a/6WO3s. It is 28x28, so sizi
| |
| 34 </paper-spinner> | 38 </paper-spinner> |
| 35 <paper-button class="cancel-button" on-tap="onCancelTap_" | 39 <paper-button class="cancel-button" on-tap="onCancelTap_" |
| 36 id="cancel">$i18n{cancel}</paper-button> | 40 id="cancel" disabled="[[clearingInProgress_]]"> |
|
Dan Beam
2016/09/15 21:15:40
wat? you're disabling the /cancel/ button? why n
dpapad
2016/09/20 00:52:36
The clearing button is already being disabled, usi
| |
| 41 $i18n{cancel} | |
| 42 </paper-button> | |
| 37 <paper-button class="action-button" on-tap="onResetTap_" | 43 <paper-button class="action-button" on-tap="onResetTap_" |
| 38 id="reset" disabled="[[clearingInProgress_]]"> | 44 id="reset" disabled="[[clearingInProgress_]]"> |
| 39 $i18n{resetPageCommit} | 45 $i18n{resetPageCommit} |
| 40 </paper-button> | 46 </paper-button> |
| 41 </div> | 47 </div> |
| 42 <div class="footer"> | 48 <div class="footer"> |
| 43 <paper-checkbox id="sendSettings" | 49 <paper-checkbox id="sendSettings" |
| 44 checked>$i18n{resetPageFeedback}</paper-checkbox> | 50 checked>$i18n{resetPageFeedback}</paper-checkbox> |
| 45 <a is="action-link" | 51 <a is="action-link" |
| 46 on-tap="onShowReportedSettingsTap_">$i18n{viewReportedSettings}</a> | 52 on-tap="onShowReportedSettingsTap_">$i18n{viewReportedSettings}</a> |
| 47 </div> | 53 </div> |
| 48 </dialog> | 54 </dialog> |
| 49 </template> | 55 </template> |
| 50 <script src="reset_profile_dialog.js"></script> | 56 <script src="reset_profile_dialog.js"></script> |
| 51 </dom-module> | 57 </dom-module> |
| OLD | NEW |