Skip to content

Commit

Permalink
[grit] Fix condition to include idle timeout bubble messages
Browse files Browse the repository at this point in the history 
google_chrome_strings.grd was incorrectly not including idle timeout
bubble messages in ChromeOS. Change the condition to `toolkit_views`
there and in chromium_strings.grd, that lacked any conditional block.

Bug: 1310120
Change-Id: I213f25eeec75f9b233ef16fe7cb96a56b7ef06b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4719489
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1181684}
  • Loading branch information
@hferreiro
hferreiro authored and Chromium LUCI CQ committed Aug 9, 2023
1 parent 7213b90 commit 9566661
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
26 changes: 14 additions & 12 deletions chrome/app/chromium_strings.grd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1464,18 +1464,20 @@ Permissions you've already given to websites and apps may apply to this account.
Share a Chromium tab
</message>
<!-- Idle timeout bubble. -->
<message name="IDS_IDLE_BUBBLE_TITLE_CLOSE" desc="Title of a bubble that informs the user that Chrome closed automatically, because they were away from the computer for X minutes.">
Chromium was automatically closed
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLOSE_AND_CLEAR" desc="Body of a bubble that informs the user that Chromium closed + cleared data automatically, because they were away from the computer for X minutes.">
Your organization closes Chromium when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>. Browsing data was deleted. This could include history, autofill, and downloads.
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLEAR" desc="Body of a bubble that informs the user that Chromium cleared data automatically, because they were away from the computer for X minutes.">
Your organization deletes Chromium data when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>. This could include history, autofill, and downloads.
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLOSE" desc="Body of a bubble that informs the user that Chromium closed automatically, because they were away from the computer for X minutes.">
Your organization closes Chromium when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>.
</message>
<if expr="toolkit_views">
<message name="IDS_IDLE_BUBBLE_TITLE_CLOSE" desc="Title of a bubble that informs the user that Chrome closed automatically, because they were away from the computer for X minutes.">
Chromium was automatically closed
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLOSE_AND_CLEAR" desc="Body of a bubble that informs the user that Chromium closed + cleared data automatically, because they were away from the computer for X minutes.">
Your organization closes Chromium when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>. Browsing data was deleted. This could include history, autofill, and downloads.
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLEAR" desc="Body of a bubble that informs the user that Chromium cleared data automatically, because they were away from the computer for X minutes.">
Your organization deletes Chromium data when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>. This could include history, autofill, and downloads.
</message>
<message name="IDS_IDLE_BUBBLE_BODY_CLOSE" desc="Body of a bubble that informs the user that Chromium closed automatically, because they were away from the computer for X minutes.">
Your organization closes Chromium when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>.
</message>
</if>
<!-- Idle timeout dialog. -->
<if expr="not is_android and not is_chromeos">
<message name="IDS_IDLE_TIMEOUT_CLOSE_TITLE" desc="Title of the Idle Timeout dialog, warning the user that their windows are about to close.">
Expand Down
6 changes: 4 additions & 2 deletions chrome/app/google_chrome_strings.grd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1497,8 +1497,8 @@ Permissions you've already given to websites and apps may apply to this account.
<message name="IDS_DESKTOP_MEDIA_PICKER_TITLE_WEB_CONTENTS_ONLY" desc="Title for the window picker dialog shown when desktop capture of a tab is requested by an app.">
Share a Chrome tab
</message>
<!-- Idle timeout bubble. -->
<if expr="not is_android and not is_chromeos">
<!-- Idle timeout bubble. -->
<if expr="toolkit_views">
<message name="IDS_IDLE_BUBBLE_TITLE_CLOSE" desc="Title of a bubble that informs the user that Chrome closed automatically, because they were away from the computer for X minutes.">
Chrome was automatically closed
</message>
Expand All @@ -1511,7 +1511,9 @@ Permissions you've already given to websites and apps may apply to this account.
<message name="IDS_IDLE_BUBBLE_BODY_CLOSE" desc="Body of a bubble that informs the user that Chrome closed automatically, because they were away from the computer for X minutes.">
Your organization closes Chrome when it isn't used for <ph name="TIMEOUT_DURATION">$1<ex>30 minutes</ex></ph>.
</message>
</if>
<!-- Idle timeout dialog. -->
<if expr="not is_android and not is_chromeos">
<message name="IDS_IDLE_TIMEOUT_CLOSE_TITLE" desc="Title of the Idle Timeout dialog, warning the user that their windows are about to close.">
Chrome will soon close
</message>
Expand Down

0 comments on commit 9566661

Please sign in to comment.