Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update help link to be relevant for Windows users #6659

Merged
merged 1 commit into from
Sep 17, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Sep 16, 2020

Fixes brave/brave-browser#11746

Submitter Checklist:

Test Plan:

  1. Be on Windows
  2. Have a fully built version
  3. Try to do an update - update must fail
  4. Verify link shown under Learn more goes to correct place

Would be great if there was a debug way to show the full status - but I find anything unfortunately

I tested myself on Windows by applying this patch manually:

diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch b/patches/chrome-browser-resources-settings-about_page-about_page.h ml.patch
index 5d1e21798d..3a4d208479 100644
--- a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch
+++ b/patches/chrome-browser-resources-settings-about_page-about_page.html.patch
@@ -1,13 +1,29 @@
 diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
-index e8299dcfeb8bda338290bd0f89811ca2e613be9f..888ce6e999104bb3ec2ae187213badde20d61be7 100644
+index e8299dcfeb8bda338290bd0f89811ca2e613be9f..ba9e1ba66b44388add93d47a9d853d2358cdd8e3 100644
 --- a/chrome/browser/resources/settings/about_page/about_page.html
 +++ b/chrome/browser/resources/settings/about_page/about_page.html
-@@ -72,9 +72,10 @@
+@@ -57,7 +57,7 @@
+           when update is done) or set the src (when it's updating). -->
+ <if expr="not chromeos">
+         <div class="icon-container"
+-            hidden="[[!shouldShowIcons_(showUpdateStatus_)]]">
++            hidden="[[shouldShowIcons_(showUpdateStatus_)]]">
+           <iron-icon
+               icon$="[[getUpdateStatusIcon_(
+                   obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
+@@ -67,14 +67,15 @@
+ </if>
+         <div class="flex cr-padded-text">
+ <if expr="not chromeos">
+-          <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]">
++          <div id="updateStatusMessage" hidden="[[showUpdateStatus_]]">
+             <div
                  inner-h-t-m-l="[[getUpdateStatusMessage_(
                      currentUpdateStatusEvent_)]]">
              </div>
-+<if expr="is_win"><a hidden$="[[!shouldShowLearnMoreLink_(currentUpdateStatusEvent_)]]" target="_blank" href="https://support.brave.com/hc/en-us/articles 360042816611-Why-isn-t-Brave-updating-automatically-on-Windows-"></if><if expr="not is_win">
-             <a hidden$="[[!shouldShowLearnMoreLink_(
+-            <a hidden$="[[!shouldShowLearnMoreLink_(
++<if expr="is_win"><a hidden$="[[shouldShowLearnMoreLink_(currentUpdateStatusEvent_)]]" target="_blank" href="https://support.brave.com/hc/en-us/articles/ 60042816611-Why-isn-t-Brave-updating-automatically-on-Windows-"></if><if expr="not is_win">
++            <a hidden$="[[shouldShowLearnMoreLink_(
                  currentUpdateStatusEvent_)]]" target="_blank"
 -                href="https://support.google.com/chrome?p=update_error">
 +                    href="https://community.brave.com?p=update_error"></if>

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@bsclifton bsclifton requested a review from bridiver as a code owner September 16, 2020 21:02
@bsclifton bsclifton self-assigned this Sep 16, 2020
@mkarolin
Copy link
Collaborator

I am wondering if it would be possible to implement this via https://github.com/brave/brave-core/blob/master/browser/resources/settings/brave_overrides/about_page.js and get rid of the patch altogether.

@bsclifton
Copy link
Member Author

@mkarolin oh wow- yeah that should definitely work 😄 Good call! Will look at that approach

@bsclifton bsclifton force-pushed the bsc-fix-about-help-link branch from b10b236 to 21239e4 Compare September 17, 2020 07:41
@bsclifton
Copy link
Member Author

@mkarolin updated! 😄

Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@bsclifton
Copy link
Member Author

bsclifton commented Sep 17, 2020

cc: @bridiver on patch removal 😄

CI looks good; Windows had a test-install failure but is otherwise OK

Copy link
Collaborator

@bridiver bridiver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

patch change is good, but @petemill should probably checkoff the actual changes

@bsclifton bsclifton force-pushed the bsc-fix-about-help-link branch from 21239e4 to f010f62 Compare September 17, 2020 21:48
Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

The <if> expression will get evaluated properly by grit

Fixes brave/brave-browser#11746
@bsclifton bsclifton force-pushed the bsc-fix-about-help-link branch from f010f62 to b1380ee Compare September 17, 2020 21:50
@bsclifton bsclifton merged commit 88750a9 into master Sep 17, 2020
@bsclifton bsclifton deleted the bsc-fix-about-help-link branch September 17, 2020 21:52
@bsclifton bsclifton added this to the 1.16.x - Nightly milestone Sep 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Learn more (on about page) should go to a more helpful support page
4 participants