Revert "MacPWAs: Add hide option to beforeUnload dialog"
This reverts commit 419b56c8813a4d7873502046ce9b86edb958703d.
Reason for revert: Suspected culprit for ExtensionApiTest.ConfirmQueue failure.
https://ci.chromium.org/ui/p/chromium/builders/ci/Mac%20ASan%2064%20Tests%20(1)/71021
Original change's description:
> MacPWAs: Add hide option to beforeUnload dialog
>
> Add a new AppModalDialogController::Type to consolidate the various
> bools for reload, unload, etc. Add an option for a "hide or quit"
> dialog. Add a function to control setting this that just returns
> false for now.
>
> The new UI has the text "Quit $APP?", instead of "Leave app".
> To TabModalDialogManagerDelegate, add a GetAppName method to retrieve
> the app name to populate the $APP string.
>
> Bug: 1225716
> Change-Id: I30833a787e4cede497682fc29f74169fc55823e8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3065472
> Reviewed-by: Robert Sesek <[email protected]>
> Reviewed-by: John Abd-El-Malek <[email protected]>
> Reviewed-by: Avi Drissman <[email protected]>
> Commit-Queue: ccameron <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#910881}
Bug: 1225716
Change-Id: I2ef8b81223d76d540f1526ea7e79cd6ba0d69630
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3089124
Bot-Commit: Rubber Stamper <[email protected]>
Owners-Override: Morten Stenshorne <[email protected]>
Auto-Submit: Morten Stenshorne <[email protected]>
Commit-Queue: Morten Stenshorne <[email protected]>
Cr-Commit-Position: refs/heads/master@{#911247}
diff --git a/components/javascript_dialogs_strings.grdp b/components/javascript_dialogs_strings.grdp
index e175be0..fcb4999 100644
--- a/components/javascript_dialogs_strings.grdp
+++ b/components/javascript_dialogs_strings.grdp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
-
+
<!-- JavaScript Dialog Box strings -->
<message name="IDS_JAVASCRIPT_MESSAGEBOX_TITLE" desc="Title for JavaScript prompt and confirm originating from a webpage">
<ph name="SITE">$1<ex>http://www.google.com</ex></ph> says
@@ -23,27 +23,15 @@
<message name="IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE" desc="Title for the 'before unload' dialog.">
Leave site?
</message>
- <message name="IDS_BEFOREUNLOAD_APP_MESSAGEBOX_TITLE" desc="Title for the 'before unload' dialog for apps.">
+ <message name="IDS_BEFOREUNLOAD_APP_MESSAGEBOX_TITLE" desc="Title for the 'before unload' dialog for apps.">
Leave app?
</message>
- <message name="IDS_BEFOREUNLOAD_QUIT_APP_MESSAGEBOX_TITLE" desc="Title for the 'before unload' dialog for apps.">
- Quit <ph name="APP">$1<ex>Google Chat</ex></ph>?
- </message>
<message name="IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL" desc="The text on the button which navigates the user away from the page.">
Leave
</message>
- <message name="IDS_BEFOREUNLOAD_MESSAGEBOX_QUIT_BUTTON_LABEL" desc="The text on the button which closes the app window.">
- Quit
- </message>
- <message name="IDS_BEFOREUNLOAD_MESSAGEBOX_HIDE_BUTTON_LABEL" desc="The text on the button which hides the app window.">
- Hide
- </message>
<message name="IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE" desc="Body text in a dialog asking the user to confirm that they want to leave or reload a website.">
Changes you made may not be saved.
</message>
- <message name="IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE_WITH_HIDE" desc="Body text in a dialog asking the user to confirm that they want to quit a web app, and gives the user the option to hide the app instead.">
- To continue running this application in the background, hide it.
- </message>
<!-- "Before Reload" Dialog Box strings (same as "Before Unload" but when reloading rather than unloading the page -->
<message name="IDS_BEFORERELOAD_MESSAGEBOX_TITLE" desc="Title for the 'before unload' dialog for reloads.">
