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

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

Issue 2698133003: MD Settings: About: Show connectionTypes message (Closed)
Patch Set: Created 3 years, 10 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview 'settings-about-page' contains version and OS related 6 * @fileoverview 'settings-about-page' contains version and OS related
7 * information. 7 * information.
8 */ 8 */
9 Polymer({ 9 Polymer({
10 is: 'settings-about-page', 10 is: 'settings-about-page',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 showUpdateStatus_: Boolean, 55 showUpdateStatus_: Boolean,
56 56
57 /** @private */ 57 /** @private */
58 showButtonContainer_: Boolean, 58 showButtonContainer_: Boolean,
59 59
60 /** @private */ 60 /** @private */
61 showRelaunch_: Boolean, 61 showRelaunch_: Boolean,
62 62
63 // <if expr="chromeos"> 63 // <if expr="chromeos">
64 /** @private */ 64 /** @private */
65 showConnectionType_: Boolean,
66
67 /** @private */
65 showRelaunchAndPowerwash_: { 68 showRelaunchAndPowerwash_: {
66 type: Boolean, 69 type: Boolean,
67 computed: 'computeShowRelaunchAndPowerwash_(' + 70 computed: 'computeShowRelaunchAndPowerwash_(' +
68 'currentUpdateStatusEvent_, targetChannel_)', 71 'currentUpdateStatusEvent_, targetChannel_)',
69 }, 72 },
70 73
71 /** @private */ 74 /** @private */
72 showCheckUpdates_: { 75 showCheckUpdates_: {
73 type: Boolean, 76 type: Boolean,
74 computed: 'computeShowCheckUpdates_(currentUpdateStatusEvent_)', 77 computed: 'computeShowCheckUpdates_(currentUpdateStatusEvent_)',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // Assume the "updated" status is stale if we haven't checked yet. 206 // Assume the "updated" status is stale if we haven't checked yet.
204 if (this.currentUpdateStatusEvent_.status == UpdateStatus.UPDATED && 207 if (this.currentUpdateStatusEvent_.status == UpdateStatus.UPDATED &&
205 !this.hasCheckedForUpdates_) { 208 !this.hasCheckedForUpdates_) {
206 this.showUpdateStatus_ = false; 209 this.showUpdateStatus_ = false;
207 return; 210 return;
208 } 211 }
209 // </if> 212 // </if>
210 this.showUpdateStatus_ = 213 this.showUpdateStatus_ =
211 this.currentUpdateStatusEvent_.status != UpdateStatus.DISABLED && 214 this.currentUpdateStatusEvent_.status != UpdateStatus.DISABLED &&
212 !this.obsoleteSystemInfo_.endOfLine; 215 !this.obsoleteSystemInfo_.endOfLine;
216 this.showConnectionType_ = this.showUpdateStatus_ &&
217 !!this.currentUpdateStatusEvent_.connectionTypes;
213 }, 218 },
214 219
215 /** 220 /**
216 * Hide the button container if all buttons are hidden, otherwise the 221 * Hide the button container if all buttons are hidden, otherwise the
217 * container displayes an unwanted border (see secondary-action class). 222 * container displayes an unwanted border (see secondary-action class).
218 * @private 223 * @private
219 */ 224 */
220 updateShowButtonContainer_: function() { 225 updateShowButtonContainer_: function() {
221 // <if expr="not chromeos"> 226 // <if expr="not chromeos">
222 this.showButtonContainer_ = this.showRelaunch_; 227 this.showButtonContainer_ = this.showRelaunch_;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 }); 405 });
401 }, 406 },
402 407
403 // <if expr="_google_chrome"> 408 // <if expr="_google_chrome">
404 /** @private */ 409 /** @private */
405 onReportIssueTap_: function() { 410 onReportIssueTap_: function() {
406 this.aboutBrowserProxy_.openFeedbackDialog(); 411 this.aboutBrowserProxy_.openFeedbackDialog();
407 }, 412 },
408 // </if> 413 // </if>
409 }); 414 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698