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

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

Issue 2011703002: MD Settings: About page, hooking up channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_regulatory_info
Patch Set: Nit. Created 4 years, 6 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="/about_page/about_page_browser_proxy.html"> 2 <link rel="import" href="/about_page/about_page_browser_proxy.html">
3 <link rel="import" href="/i18n_setup.html"> 3 <link rel="import" href="/i18n_setup.html">
4 <link rel="import" href="/icons.html"> 4 <link rel="import" href="/icons.html">
5 <link rel="import" href="/settings_page/main_page_behavior.html"> 5 <link rel="import" href="/settings_page/main_page_behavior.html">
6 <link rel="import" href="/settings_page/settings_animated_pages.html"> 6 <link rel="import" href="/settings_page/settings_animated_pages.html">
7 <link rel="import" href="/settings_page/settings_section.html"> 7 <link rel="import" href="/settings_page/settings_section.html">
8 <link rel="import" href="/settings_page_css.html"> 8 <link rel="import" href="/settings_page_css.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 10 <link rel="import" href="chrome://resources/cr_elements/icons.html">
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 </div> 68 </div>
69 <div class="settings-box two-line"> 69 <div class="settings-box two-line">
70 <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_)]] "> 70 <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_)]] ">
71 <iron-icon 71 <iron-icon
72 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" 72 icon$="[[getIcon_(currentUpdateStatusEvent_)]]"
73 src="[[getIconSrc_(currentUpdateStatusEvent_)]]"> 73 src="[[getIconSrc_(currentUpdateStatusEvent_)]]">
74 </iron-icon> 74 </iron-icon>
75 </div> 75 </div>
76 <div class="start"> 76 <div class="start">
77 <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_) ]]"> 77 <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_) ]]">
78 [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]] 78 [[getUpdateStatusMessage_(currentUpdateStatusEvent_,targetChanne l_)]]
dschuyler 2016/05/27 22:16:21 Please wrap line (and/or add a space after the com
dpapad 2016/05/27 23:32:17 Done.
79 </div> 79 </div>
80 <div class="secondary">$i18n{aboutBrowserVersion}</div> 80 <div class="secondary">$i18n{aboutBrowserVersion}</div>
81 </div> 81 </div>
82 <paper-button id="relaunch" class="secondary-action" 82 <paper-button id="relaunch" class="secondary-action"
83 <if expr="not chromeos">
83 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]" 84 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
85 </if>
86 <if expr="chromeos">
87 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_,targetC hannel_)]]"
dschuyler 2016/05/27 22:16:21 Please wrap line (and/or add a space after the com
dpapad 2016/05/27 23:32:17 Done. Regarding breaking line: Do we have a rule
dschuyler 2016/05/28 00:07:43 It's at https://www.chromium.org/developers/web-d
88 </if>
84 on-tap="onRelaunchTap_"> 89 on-tap="onRelaunchTap_">
85 $i18n{aboutRelaunch} 90 $i18n{aboutRelaunch}
86 </paper-button> 91 </paper-button>
87 <if expr="chromeos"> 92 <if expr="chromeos">
88 <paper-button id="relaunchAndPowerwash" class="secondary-action" 93 <paper-button id="relaunchAndPowerwash" class="secondary-action"
89 hidden="[[!shouldShowRelaunchAndPowerwash_(currentUpdateStatusEv ent_)]]" 94 hidden="[[!shouldShowRelaunchAndPowerwash_(currentUpdateStatusEv ent_,targetChannel_)]]"
dschuyler 2016/05/27 22:16:21 Please wrap line and add a space after the comma.
dpapad 2016/05/27 23:32:17 Done.
90 on-tap="onRelaunchAndPowerwashTap_"> 95 on-tap="onRelaunchAndPowerwashTap_">
91 $i18n{aboutRelaunchAndPowerwash} 96 $i18n{aboutRelaunchAndPowerwash}
92 </paper-button> 97 </paper-button>
93 <paper-button id="checkForUpdates" class="secondary-action" 98 <paper-button id="checkForUpdates" class="secondary-action"
94 hidden="[[!shouldShowCheckUpdates_(currentUpdateStatusEvent_)]]" 99 hidden="[[!shouldShowCheckUpdates_(currentUpdateStatusEvent_)]]"
95 on-tap="onCheckUpdatesTap_"> 100 on-tap="onCheckUpdatesTap_">
96 $i18n{aboutCheckForUpdates} 101 $i18n{aboutCheckForUpdates}
97 </paper-button> 102 </paper-button>
98 </if> 103 </if>
99 </div> 104 </div>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <settings-subpage page-title="Detailed build information"> 144 <settings-subpage page-title="Detailed build information">
140 <settings-detailed-build-info></settings-detailed-build-info> 145 <settings-detailed-build-info></settings-detailed-build-info>
141 </settings-subpage> 146 </settings-subpage>
142 </template> 147 </template>
143 </if> 148 </if>
144 </settings-animated-pages> 149 </settings-animated-pages>
145 </settings-section> 150 </settings-section>
146 </template> 151 </template>
147 <script src="about_page.js"></script> 152 <script src="about_page.js"></script>
148 </dom-module> 153 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698