Revert "Enable the rich PWA install for the Password Manager."
This reverts commit 36524ee063721b5685db84b32b5156b30264a0b7.
Reason for revert: crbug.com/381069204
The change is not working as expected neither on English, nor
on other locales.
Original change's description:
> Enable the rich PWA install for the Password Manager.
>
> Only available in English for now.
>
> Screenshots:
> https://screenshot.googleplex.com/6p7TJmZ2JgQXj6M.png
> https://screenshot.googleplex.com/7X8uGJcYqbf9vrq.png
>
> Bug: https://crbug.com/41494218
> Test: browser_tests --gtest_filter="*AppBannerManagerDesktopBrowserTest*"
> Change-Id: I82678141c667d5300a649fb108a82a7a52397aea
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5890520
> Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
> Commit-Queue: Jim Blackler <jimblackler@chromium.org>
> Reviewed-by: Maria Kazinova <kazinova@google.com>
> Cr-Commit-Position: refs/heads/main@{#1364175}
Bug: https://crbug.com/41494218
Change-Id: I23050c8139595765adad0ca236780353dddbf1e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6269295
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Auto-Submit: Maria Kazinova <kazinova@google.com>
Cr-Commit-Position: refs/heads/main@{#1420467}
diff --git a/chrome/browser/resources/password_manager/BUILD.gn b/chrome/browser/resources/password_manager/BUILD.gn
index 82cd886..3d6c39b 100644
--- a/chrome/browser/resources/password_manager/BUILD.gn
+++ b/chrome/browser/resources/password_manager/BUILD.gn
@@ -31,10 +31,6 @@
"images/move_passwords_promo_dark.svg",
"images/password_checkup_promo.svg",
"images/password_checkup_promo_dark.svg",
- "images/password_manager_screenshot_checkup_1x_en.png",
- "images/password_manager_screenshot_checkup_2x_en.png",
- "images/password_manager_screenshot_passwords_1x_en.png",
- "images/password_manager_screenshot_passwords_2x_en.png",
"images/password_shortcut_promo.svg",
"images/password_shortcut_promo_dark.svg",
"images/passwords_on_web_promo.svg",
diff --git a/chrome/browser/resources/password_manager/chrome_branded_manifest.webmanifest b/chrome/browser/resources/password_manager/chrome_branded_manifest.webmanifest
index 0eafcf5..6d8075f8 100644
--- a/chrome/browser/resources/password_manager/chrome_branded_manifest.webmanifest
+++ b/chrome/browser/resources/password_manager/chrome_branded_manifest.webmanifest
@@ -9,34 +9,6 @@
}
],
"description": "$i18n{passwordManagerDescription}",
- "lang": "$i18n{language}",
- "categories": ["utilities"],
- "screenshots": [
- {
- "src": "chrome://password-manager/images/password_manager_screenshot_passwords_1x.png",
- "type": "image/png",
- "sizes": "1018x573",
- "form_factor": "wide"
- },
- {
- "src": "chrome://password-manager/images/password_manager_screenshot_passwords_2x.png",
- "type": "image/png",
- "sizes": "2036x1145",
- "form_factor": "wide"
- },
- {
- "src": "chrome://password-manager/images/password_manager_screenshot_checkup_1x.png",
- "type": "image/png",
- "sizes": "1018x573",
- "form_factor": "wide"
- },
- {
- "src": "chrome://password-manager/images/password_manager_screenshot_checkup_2x.png",
- "type": "image/png",
- "sizes": "2036x1145",
- "form_factor": "wide"
- }
- ],
"start_url": "/?source=pwa",
"id": "chrome://password-manager/",
"display": "standalone",
diff --git a/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_1x_en.png b/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_1x_en.png
deleted file mode 100644
index 76f55fd..0000000
--- a/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_1x_en.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_2x_en.png b/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_2x_en.png
deleted file mode 100644
index 703ba02..0000000
--- a/chrome/browser/resources/password_manager/images/password_manager_screenshot_checkup_2x_en.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_1x_en.png b/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_1x_en.png
deleted file mode 100644
index f4c04594..0000000
--- a/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_1x_en.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_2x_en.png b/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_2x_en.png
deleted file mode 100644
index 413c1f302..0000000
--- a/chrome/browser/resources/password_manager/images/password_manager_screenshot_passwords_2x_en.png
+++ /dev/null
Binary files differ
diff --git a/chrome/browser/ui/webui/password_manager/password_manager_ui.cc b/chrome/browser/ui/webui/password_manager/password_manager_ui.cc
index 0c7abb04..a0b8c4d2 100644
--- a/chrome/browser/ui/webui/password_manager/password_manager_ui.cc
+++ b/chrome/browser/ui/webui/password_manager/password_manager_ui.cc
@@ -7,7 +7,6 @@
#include "base/i18n/message_formatter.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h"
#include "chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -36,7 +35,6 @@
#include "chrome/grit/theme_resources.h"
#include "components/favicon_base/favicon_url_parser.h"
#include "components/grit/components_scaled_resources.h"
-#include "components/language/core/common/locale_util.h"
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
#include "components/password_manager/core/common/password_manager_constants.h"
#include "components/signin/public/base/signin_switches.h"
@@ -85,14 +83,6 @@
IDS_PASSWORD_BUBBLES_PASSWORD_MANAGER_LINK_TEXT_SAVING_ON_DEVICE));
}
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-bool IsSystemInEnglishLanguage() {
- return g_browser_process != nullptr &&
- language::ExtractBaseLanguage(
- g_browser_process->GetApplicationLocale()) == "en";
-}
-#endif
-
content::WebUIDataSource* CreateAndAddPasswordsUIHTMLSource(
Profile* profile,
content::WebUI* web_ui) {
@@ -102,27 +92,6 @@
webui::SetupWebUIDataSource(source, base::span(kPasswordManagerResources),
IDR_PASSWORD_MANAGER_PASSWORD_MANAGER_HTML);
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- if (IsSystemInEnglishLanguage()) {
- // Until https://github.com/w3c/manifest/pull/1101 is implemented, we avoid
- // serving these English text images to users with a different locale. The
- // PWA install will simply fall back to the non-rich install dialog if
- // these resources 404.
- source->AddResourcePath(
- "images/password_manager_screenshot_checkup_1x.png",
- IDR_PASSWORD_MANAGER_IMAGES_PASSWORD_MANAGER_SCREENSHOT_CHECKUP_1X_EN_PNG);
- source->AddResourcePath(
- "images/password_manager_screenshot_checkup_2x.png",
- IDR_PASSWORD_MANAGER_IMAGES_PASSWORD_MANAGER_SCREENSHOT_CHECKUP_2X_EN_PNG);
- source->AddResourcePath(
- "images/password_manager_screenshot_passwords_1x.png",
- IDR_PASSWORD_MANAGER_IMAGES_PASSWORD_MANAGER_SCREENSHOT_PASSWORDS_1X_EN_PNG);
- source->AddResourcePath(
- "images/password_manager_screenshot_passwords_2x.png",
- IDR_PASSWORD_MANAGER_IMAGES_PASSWORD_MANAGER_SCREENSHOT_PASSWORDS_2X_EN_PNG);
- }
-#endif
-
#if !BUILDFLAG(OPTIMIZE_WEBUI)
source->AddResourcePaths(base::span(kSettingsSharedResources));
#endif
