Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Side by Side Diff: chrome/browser/resources/settings/reset_page/reset_page.html

Issue 2375223002: md-settings: Fix back navigation from /resetProfileSettings. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/reset_page/reset_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="/i18n_setup.html"> 3 <link rel="import" href="/i18n_setup.html">
4 <link rel="import" href="/reset_page/reset_profile_dialog.html"> 4 <link rel="import" href="/reset_page/reset_profile_dialog.html">
5 <link rel="import" href="/route.html"> 5 <link rel="import" href="/route.html">
6 <link rel="import" href="/settings_shared_css.html"> 6 <link rel="import" href="/settings_shared_css.html">
7 7
8 <if expr="chromeos"> 8 <if expr="chromeos">
9 <link rel="import" href="/reset_page/powerwash_dialog.html"> 9 <link rel="import" href="/reset_page/powerwash_dialog.html">
10 </if> 10 </if>
11 11
12 <dom-module id="settings-reset-page"> 12 <dom-module id="settings-reset-page">
13 <template> 13 <template>
14 <style include="settings-shared"></style> 14 <style include="settings-shared"></style>
15 <div class="settings-box first two-line single-column" id="resetProfile" 15 <div class="settings-box first two-line single-column" id="resetProfile"
16 on-tap="onShowResetProfileDialog_" actionable> 16 on-tap="onShowResetProfileDialog_" actionable>
17 <div>$i18n{resetPageTitle}</div> 17 <div>$i18n{resetPageTitle}</div>
18 <div class="secondary">$i18n{resetPageDescription}</div> 18 <div class="secondary">$i18n{resetPageDescription}</div>
19 </div> 19 </div>
20 <template is="cr-lazy-render" id="resetProfileDialog"> 20 <template is="dom-if" if="[[showResetProfileDialog_]]"
21 id="resetProfileDialog" restamp>
tommycli 2016/09/28 21:59:26 Do you still need to specify the ID of this if you
alito 2016/09/28 22:10:32 You are right. The ID is no longer needed. Removed
21 <settings-reset-profile-dialog on-close="onResetProfileDialogClose_"> 22 <settings-reset-profile-dialog on-close="onResetProfileDialogClose_">
22 </settings-reset-profile-dialog> 23 </settings-reset-profile-dialog>
23 </template> 24 </template>
24 <if expr="chromeos"> 25 <if expr="chromeos">
25 <div class="settings-box two-line single-column" id="powerwash" actionable 26 <div class="settings-box two-line single-column" id="powerwash" actionable
26 on-tap="onShowPowerwashDialog_" hidden="[[!allowPowerwash_]]"> 27 on-tap="onShowPowerwashDialog_" hidden="[[!allowPowerwash_]]">
27 <div>$i18n{powerwashTitle}</div> 28 <div>$i18n{powerwashTitle}</div>
28 <div class="secondary">$i18n{powerwashDescription}</div> 29 <div class="secondary">$i18n{powerwashDescription}</div>
29 </div> 30 </div>
30 <template is="dom-if" if="[[showPowerwashDialog_]]" restamp> 31 <template is="dom-if" if="[[showPowerwashDialog_]]" restamp>
31 <settings-powerwash-dialog on-close="onPowerwashDialogClose_"> 32 <settings-powerwash-dialog on-close="onPowerwashDialogClose_">
32 </settings-powerwash-dialog> 33 </settings-powerwash-dialog>
33 </template> 34 </template>
34 </if> 35 </if>
35 </template> 36 </template>
36 <script src="/reset_page/reset_page.js"></script> 37 <script src="/reset_page/reset_page.js"></script>
37 </dom-module> 38 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/reset_page/reset_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698