Commit 37187029 authored by Xinghui Lu's avatar Xinghui Lu Committed by Commit Bot

Update Safe Browsing billing interstitial tab title

The current implementation in Chrome shows "Security Error".
The title should be "Page may charge money" instead.

Bug: 913889
Change-Id: I8655217cadc4e481d149ad5a80520367148dc2cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732309Reviewed-by: default avatarCarlos IL <carlosil@chromium.org>
Reviewed-by: default avatarChangwan Ryu <changwan@chromium.org>
Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Commit-Queue: Xinghui Lu <xinghuilu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684134}
parent 5679db78
...@@ -16,6 +16,7 @@ IDS_HARMFUL_V3_PRIMARY_PARAGRAPH ...@@ -16,6 +16,7 @@ IDS_HARMFUL_V3_PRIMARY_PARAGRAPH
IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH
IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE
IDS_HARMFUL_V3_PROCEED_PARAGRAPH IDS_HARMFUL_V3_PROCEED_PARAGRAPH
IDS_BILLING_TITLE
IDS_BILLING_HEADING IDS_BILLING_HEADING
IDS_BILLING_PRIMARY_PARAGRAPH IDS_BILLING_PRIMARY_PARAGRAPH
IDS_BILLING_PRIMARY_BUTTON IDS_BILLING_PRIMARY_BUTTON
......
...@@ -150,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialUITest, UnwantedSoftwareInterstitialQuiet) { ...@@ -150,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialUITest, UnwantedSoftwareInterstitialQuiet) {
IN_PROC_BROWSER_TEST_F(InterstitialUITest, BillingInterstitialQuiet) { IN_PROC_BROWSER_TEST_F(InterstitialUITest, BillingInterstitialQuiet) {
TestInterstitial( TestInterstitial(
GURL("chrome://interstitials/quietsafebrowsing?type=billing"), GURL("chrome://interstitials/quietsafebrowsing?type=billing"),
"Security error", IDS_BILLING_WEBVIEW_HEADING); "Page may charge money", IDS_BILLING_WEBVIEW_HEADING);
} }
IN_PROC_BROWSER_TEST_F(InterstitialUITest, ClientsideMalwareInterstitial) { IN_PROC_BROWSER_TEST_F(InterstitialUITest, ClientsideMalwareInterstitial) {
...@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialUITest, ClientsidePhishingInterstitial) { ...@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialUITest, ClientsidePhishingInterstitial) {
IN_PROC_BROWSER_TEST_F(InterstitialUITest, BillingInterstitial) { IN_PROC_BROWSER_TEST_F(InterstitialUITest, BillingInterstitial) {
TestInterstitial(GURL("chrome://interstitials/safebrowsing?type=billing"), TestInterstitial(GURL("chrome://interstitials/safebrowsing?type=billing"),
"Security error", IDS_BILLING_HEADING); "Page may charge money", IDS_BILLING_HEADING);
} }
IN_PROC_BROWSER_TEST_F(InterstitialUITest, CaptivePortalInterstitial) { IN_PROC_BROWSER_TEST_F(InterstitialUITest, CaptivePortalInterstitial) {
......
...@@ -314,6 +314,8 @@ void SafeBrowsingLoudErrorUI::PopulateBillingLoadTimeData( ...@@ -314,6 +314,8 @@ void SafeBrowsingLoudErrorUI::PopulateBillingLoadTimeData(
load_time_data->SetBoolean("phishing", false); load_time_data->SetBoolean("phishing", false);
load_time_data->SetBoolean("overridable", true); load_time_data->SetBoolean("overridable", true);
load_time_data->SetString("tabTitle",
l10n_util::GetStringUTF16(IDS_BILLING_TITLE));
load_time_data->SetString("heading", load_time_data->SetString("heading",
l10n_util::GetStringUTF16(IDS_BILLING_HEADING)); l10n_util::GetStringUTF16(IDS_BILLING_HEADING));
load_time_data->SetString( load_time_data->SetString(
......
...@@ -152,6 +152,8 @@ void SafeBrowsingQuietErrorUI::PopulatePhishingLoadTimeData( ...@@ -152,6 +152,8 @@ void SafeBrowsingQuietErrorUI::PopulatePhishingLoadTimeData(
void SafeBrowsingQuietErrorUI::PopulateBillingLoadTimeData( void SafeBrowsingQuietErrorUI::PopulateBillingLoadTimeData(
base::DictionaryValue* load_time_data) { base::DictionaryValue* load_time_data) {
load_time_data->SetBoolean("phishing", false); load_time_data->SetBoolean("phishing", false);
load_time_data->SetString("tabTitle",
l10n_util::GetStringUTF16(IDS_BILLING_TITLE));
load_time_data->SetString( load_time_data->SetString(
"heading", l10n_util::GetStringUTF16(IDS_BILLING_WEBVIEW_HEADING)); "heading", l10n_util::GetStringUTF16(IDS_BILLING_WEBVIEW_HEADING));
load_time_data->SetString( load_time_data->SetString(
......
...@@ -405,6 +405,9 @@ ...@@ -405,6 +405,9 @@
</if> </if>
<!-- Billing interstitial --> <!-- Billing interstitial -->
<message name="IDS_BILLING_TITLE" desc="The tab title for the Safe Browsing Billing interstitial.">
Page may charge money
</message>
<message name="IDS_BILLING_HEADING" desc="The large heading at the top of the billing interstitial."> <message name="IDS_BILLING_HEADING" desc="The large heading at the top of the billing interstitial.">
The page ahead may try to charge you money The page ahead may try to charge you money
</message> </message>
......
a8634b9ed4f8e7829c25a89ef83b68217d0c564c
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment