MD Settings: Fix "Check for updates" button regression.

chrome/browser/resources/settings/about_page/about_page.html

Index: chrome/browser/resources/settings/about_page/about_page.html
diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
index 0608e5c7528745d0b437c0b1b8bd884c06589ef6..d657f1c5e24bf8afee65c5941a0fd15b434c48a1 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -82,17 +82,14 @@
             </div>
             <div class="settings-box two-line">
               <iron-icon
-                  hidden="[[!shouldShowUpdateStatusIcon_(
-                      obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
+                  hidden="[[!showUpdateStatus_]]"
                   icon$="[[getIcon_(
                       obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
                   src="[[getIconSrc_(
                       obsoleteSystemInfo_, currentUpdateStatusEvent_)]]">
               </iron-icon>
               <div class="start">
-                <div id="updateStatusMessage"
-                    hidden="[[!shouldShowUpdateStatusMessage_(
-                        obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
+                <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]"
 <if expr="not chromeos">
                     inner-h-t-m-l="[[getUpdateStatusMessage_(
                         currentUpdateStatusEvent_)]]">
@@ -111,29 +108,20 @@
                 </span>
                 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div>
               </div>
-              <span id="relaunchContainer"
-<if expr="not chromeos">
-                  hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
-</if>
-<if expr="chromeos">
-                  hidden="[[!shouldShowRelaunch_(
-                      currentUpdateStatusEvent_, targetChannel_)]]"
-</if>
-                  class="secondary-action">
+              <span id="buttonContainer" class="secondary-action"
+                  hidden="[[!showButtonContainer_]]">
                 <paper-button id="relaunch" class="secondary-button"
-                    on-tap="onRelaunchTap_">
+                    hidden="[[!showRelaunch_]]" on-tap="onRelaunchTap_">
                   $i18n{aboutRelaunch}
                 </paper-button>
 <if expr="chromeos">
                 <paper-button id="relaunchAndPowerwash" class="secondary-button"
-                    hidden="[[!shouldShowRelaunchAndPowerwash_(
-                        currentUpdateStatusEvent_, targetChannel_)]]"
+                    hidden="[[!showRelaunchAndPowerwash_]]"

[Dan Beam, 2016/12/06 19:10:20]

it's kind of confusing because there's something named showRelaunch_, so this
sounds like both relaunch AND a powerwash thing should be showing.

showRelaunchThenPowerwash_ or just showPowerwash_?

[dpapad, 2016/12/06 21:54:00]

There is a "Relaunch" button and a separate "Relaunch and powerwash" button. The
convention used throughout the code to name things related to those buttons is
to use the English text appearing in the button, for example

HTML id: relaunchAndPowerwash
on-tap handler: onRelaunchAndPowerwashTap_
i18n name: aboutRelaunchAndPowerwash

similarly to

HTML id: relaunch
on-tap handler: onRelaunchTap_
i18n name: aboutRelaunch

My understanding is that following such a convention makes the code more
readable. Are you suggesting to change all three usages above to use "powerwash"
instead of "relaunchAndPowerwash"? FWIW, I am just following the convention
already in this file, so this CL did not invent any new conventions, just
attempts to stay consistent with surrounding code.

                     on-tap="onRelaunchAndPowerwashTap_">
                   $i18n{aboutRelaunchAndPowerwash}
                 </paper-button>
                 <paper-button id="checkForUpdates" class="secondary-button"
-                    hidden="[[!shouldShowCheckUpdates_(
-                        currentUpdateStatusEvent_)]]"
+                    hidden="[[!showCheckUpdates_]]"
                     on-tap="onCheckUpdatesTap_">
                   $i18n{aboutCheckForUpdates}
                 </paper-button>