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

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

Issue 2421753002: MD Settings: Eliminate Relaunch button flicker at chrome://md-settings/help. (Closed)
Patch Set: Nits Created 4 years, 1 month 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/about_page/about_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/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="/lifetime_browser_proxy.html"> 5 <link rel="import" href="/lifetime_browser_proxy.html">
6 <link rel="import" href="/route.html"> 6 <link rel="import" href="/route.html">
7 <link rel="import" href="/settings_page/main_page_behavior.html"> 7 <link rel="import" href="/settings_page/main_page_behavior.html">
8 <link rel="import" href="/settings_page/settings_animated_pages.html"> 8 <link rel="import" href="/settings_page/settings_animated_pages.html">
9 <link rel="import" href="/settings_page/settings_section.html"> 9 <link rel="import" href="/settings_page/settings_section.html">
10 <link rel="import" href="/settings_page_css.html"> 10 <link rel="import" href="/settings_page_css.html">
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 <neon-animatable route-path="default"> 76 <neon-animatable route-path="default">
77 <div class="settings-box two-line"> 77 <div class="settings-box two-line">
78 <img id="product-logo" on-tap="onProductLogoTap_" 78 <img id="product-logo" on-tap="onProductLogoTap_"
79 srcset="chrome://theme/current-channel-logo@1x 1x, 79 srcset="chrome://theme/current-channel-logo@1x 1x,
80 chrome://theme/current-channel-logo@2x 2x" alt=""> 80 chrome://theme/current-channel-logo@2x 2x" alt="">
81 <span class="product-title">$i18n{aboutProductTitle}</span> 81 <span class="product-title">$i18n{aboutProductTitle}</span>
82 </div> 82 </div>
83 <div class="settings-box two-line"> 83 <div class="settings-box two-line">
84 <iron-icon 84 <iron-icon
85 hidden="[[!shouldShowUpdateStatusIcon_( 85 hidden="[[!shouldShowUpdateStatusIcon_(
86 currentUpdateStatusEvent_)]]" 86 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
87 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" 87 icon$="[[getIcon_(
88 src="[[getIconSrc_(currentUpdateStatusEvent_)]]"> 88 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
89 src="[[getIconSrc_(
90 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]">
89 </iron-icon> 91 </iron-icon>
90 <div class="start"> 92 <div class="start">
91 <div id="updateStatusMessage" 93 <div id="updateStatusMessage"
92 hidden="[[!shouldShowUpdateStatusMessage_( 94 hidden="[[!shouldShowUpdateStatusMessage_(
93 currentUpdateStatusEvent_)]]" 95 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
94 <if expr="not chromeos"> 96 <if expr="not chromeos">
95 inner-h-t-m-l="[[getUpdateStatusMessage_( 97 inner-h-t-m-l="[[getUpdateStatusMessage_(
96 currentUpdateStatusEvent_)]]"> 98 currentUpdateStatusEvent_)]]">
97 </if> 99 </if>
98 <if expr="chromeos"> 100 <if expr="chromeos">
99 inner-h-t-m-l="[[getUpdateStatusMessage_( 101 inner-h-t-m-l="[[getUpdateStatusMessage_(
100 currentUpdateStatusEvent_, targetChannel_)]]"> 102 currentUpdateStatusEvent_, targetChannel_)]]">
101 </if> 103 </if>
102 </div> 104 </div>
103 <span id="deprecationWarning" 105 <span id="deprecationWarning"
(...skipping 19 matching lines...) Expand all
123 $i18n{aboutRelaunch} 125 $i18n{aboutRelaunch}
124 </paper-button> 126 </paper-button>
125 <if expr="chromeos"> 127 <if expr="chromeos">
126 <paper-button id="relaunchAndPowerwash" class="secondary-button" 128 <paper-button id="relaunchAndPowerwash" class="secondary-button"
127 hidden="[[!shouldShowRelaunchAndPowerwash_( 129 hidden="[[!shouldShowRelaunchAndPowerwash_(
128 currentUpdateStatusEvent_, targetChannel_)]]" 130 currentUpdateStatusEvent_, targetChannel_)]]"
129 on-tap="onRelaunchAndPowerwashTap_"> 131 on-tap="onRelaunchAndPowerwashTap_">
130 $i18n{aboutRelaunchAndPowerwash} 132 $i18n{aboutRelaunchAndPowerwash}
131 </paper-button> 133 </paper-button>
132 <paper-button id="checkForUpdates" class="secondary-button" 134 <paper-button id="checkForUpdates" class="secondary-button"
133 hidden="[[!shouldShowCheckUpdates_(currentUpdateStatusEvent_ )]]" 135 hidden="[[!shouldShowCheckUpdates_(
136 currentUpdateStatusEvent_)]]"
134 on-tap="onCheckUpdatesTap_"> 137 on-tap="onCheckUpdatesTap_">
135 $i18n{aboutCheckForUpdates} 138 $i18n{aboutCheckForUpdates}
136 </paper-button> 139 </paper-button>
137 </if> 140 </if>
138 </span> 141 </span>
139 </div> 142 </div>
140 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable> 143 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable>
141 $i18n{aboutGetHelpUsingChrome} 144 $i18n{aboutGetHelpUsingChrome}
142 </div> 145 </div>
143 <if expr="_google_chrome"> 146 <if expr="_google_chrome">
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 <settings-detailed-build-info></settings-detailed-build-info> 184 <settings-detailed-build-info></settings-detailed-build-info>
182 </settings-subpage> 185 </settings-subpage>
183 </template> 186 </template>
184 </if> 187 </if>
185 </settings-animated-pages> 188 </settings-animated-pages>
186 </settings-section> 189 </settings-section>
187 </div> 190 </div>
188 </template> 191 </template>
189 <script src="about_page.js"></script> 192 <script src="about_page.js"></script>
190 </dom-module> 193 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698