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

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

Issue 2538283002: MD Settings: Fix "Check for updates" button regression. (Closed)
Patch Set: Nit. Created 4 years 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 <settings-animated-pages id="pages" section="about"> 75 <settings-animated-pages id="pages" section="about">
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="[[!showUpdateStatus_]]"
86 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
87 icon$="[[getIcon_( 86 icon$="[[getIcon_(
88 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]" 87 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
89 src="[[getIconSrc_( 88 src="[[getIconSrc_(
90 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"> 89 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]">
91 </iron-icon> 90 </iron-icon>
92 <div class="start"> 91 <div class="start">
93 <div id="updateStatusMessage" 92 <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]"
94 hidden="[[!shouldShowUpdateStatusMessage_(
95 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
96 <if expr="not chromeos"> 93 <if expr="not chromeos">
97 inner-h-t-m-l="[[getUpdateStatusMessage_( 94 inner-h-t-m-l="[[getUpdateStatusMessage_(
98 currentUpdateStatusEvent_)]]"> 95 currentUpdateStatusEvent_)]]">
99 </if> 96 </if>
100 <if expr="chromeos"> 97 <if expr="chromeos">
101 inner-h-t-m-l="[[getUpdateStatusMessage_( 98 inner-h-t-m-l="[[getUpdateStatusMessage_(
102 currentUpdateStatusEvent_, targetChannel_)]]"> 99 currentUpdateStatusEvent_, targetChannel_)]]">
103 </if> 100 </if>
104 </div> 101 </div>
105 <span id="deprecationWarning" 102 <span id="deprecationWarning"
106 hidden="[[!obsoleteSystemInfo_.obsolete]]"> 103 hidden="[[!obsoleteSystemInfo_.obsolete]]">
107 $i18n{aboutObsoleteSystem} 104 $i18n{aboutObsoleteSystem}
108 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank"> 105 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank">
109 $i18n{learnMore} 106 $i18n{learnMore}
110 </a> 107 </a>
111 </span> 108 </span>
112 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div> 109 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div>
113 </div> 110 </div>
114 <span id="relaunchContainer" 111 <span id="buttonContainer" class="secondary-action"
115 <if expr="not chromeos"> 112 hidden="[[!showButtonContainer_]]">
116 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
117 </if>
118 <if expr="chromeos">
119 hidden="[[!shouldShowRelaunch_(
120 currentUpdateStatusEvent_, targetChannel_)]]"
121 </if>
122 class="secondary-action">
123 <paper-button id="relaunch" class="secondary-button" 113 <paper-button id="relaunch" class="secondary-button"
124 on-tap="onRelaunchTap_"> 114 hidden="[[!showRelaunch_]]" on-tap="onRelaunchTap_">
125 $i18n{aboutRelaunch} 115 $i18n{aboutRelaunch}
126 </paper-button> 116 </paper-button>
127 <if expr="chromeos"> 117 <if expr="chromeos">
128 <paper-button id="relaunchAndPowerwash" class="secondary-button" 118 <paper-button id="relaunchAndPowerwash" class="secondary-button"
129 hidden="[[!shouldShowRelaunchAndPowerwash_( 119 hidden="[[!showRelaunchAndPowerwash_]]"
130 currentUpdateStatusEvent_, targetChannel_)]]"
131 on-tap="onRelaunchAndPowerwashTap_"> 120 on-tap="onRelaunchAndPowerwashTap_">
132 $i18n{aboutRelaunchAndPowerwash} 121 $i18n{aboutRelaunchAndPowerwash}
133 </paper-button> 122 </paper-button>
134 <paper-button id="checkForUpdates" class="secondary-button" 123 <paper-button id="checkForUpdates" class="secondary-button"
135 hidden="[[!shouldShowCheckUpdates_( 124 hidden="[[!showCheckUpdates_]]"
136 currentUpdateStatusEvent_)]]"
137 on-tap="onCheckUpdatesTap_"> 125 on-tap="onCheckUpdatesTap_">
138 $i18n{aboutCheckForUpdates} 126 $i18n{aboutCheckForUpdates}
139 </paper-button> 127 </paper-button>
140 </if> 128 </if>
141 </span> 129 </span>
142 </div> 130 </div>
143 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable> 131 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable>
144 <div class="start">$i18n{aboutGetHelpUsingChrome}</div> 132 <div class="start">$i18n{aboutGetHelpUsingChrome}</div>
145 <button class="icon-external" is="paper-icon-button-light"> 133 <button class="icon-external" is="paper-icon-button-light">
146 </button> 134 </button>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 <settings-detailed-build-info></settings-detailed-build-info> 178 <settings-detailed-build-info></settings-detailed-build-info>
191 </settings-subpage> 179 </settings-subpage>
192 </template> 180 </template>
193 </if> 181 </if>
194 </settings-animated-pages> 182 </settings-animated-pages>
195 </settings-section> 183 </settings-section>
196 </div> 184 </div>
197 </template> 185 </template>
198 <script src="about_page.js"></script> 186 <script src="about_page.js"></script>
199 </dom-module> 187 </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