Skip to content

GitLab

T
tangled
Commit a914abc0 authored by Joe DeBlasio's avatar Joe DeBlasio Committed by Commit Bot
Browse files
Options

[Safety Tips] Remove no-longer-needed Android strings. 

The strings for desktop and Android are now the same. This CL just
removes the unnecessary duplicate Android strings.

Fixed: 1114359
Change-Id: I2dd409a93659a13505f48712b692c51b9a988fb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353575
Commit-Queue: Joe DeBlasio <jdeblasio@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Auto-Submit: Joe DeBlasio <jdeblasio@chromium.org>
Reviewed-by: default avatarCarlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797515}
parent b500c2e0
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 39 deletions
chrome/browser/reputation/safety_tip_ui_helper.cc
View file @ a914abc0
......@@ -92,17 +92,10 @@ base::string16 GetSafetyTipTitle(
return l10n_util::GetStringUTF16(
IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE);
case security_state::SafetyTipStatus::kLookalike:
#if defined(OS_ANDROID)
return l10n_util::GetStringFUTF16(
IDS_SAFETY_TIP_ANDROID_LOOKALIKE_TITLE,
security_interstitials::common_string_util::GetFormattedHostName(
suggested_url));
#else
return l10n_util::GetStringFUTF16(
IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_TITLE,
security_interstitials::common_string_util::GetFormattedHostName(
suggested_url));
#endif
case security_state::SafetyTipStatus::kBadReputationIgnored:
case security_state::SafetyTipStatus::kLookalikeIgnored:
case security_state::SafetyTipStatus::kBadKeyword:
......@@ -123,17 +116,10 @@ base::string16 GetSafetyTipDescription(
return l10n_util::GetStringUTF16(
IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION);
case security_state::SafetyTipStatus::kLookalike:
#if defined(OS_ANDROID)
return l10n_util::GetStringFUTF16(
IDS_SAFETY_TIP_ANDROID_LOOKALIKE_DESCRIPTION,
security_interstitials::common_string_util::GetFormattedHostName(
suggested_url));
#else
return l10n_util::GetStringFUTF16(
IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_DESCRIPTION,
security_interstitials::common_string_util::GetFormattedHostName(
suggested_url));
#endif
case security_state::SafetyTipStatus::kBadReputationIgnored:
case security_state::SafetyTipStatus::kLookalikeIgnored:
case security_state::SafetyTipStatus::kBadKeyword:
......@@ -147,17 +133,10 @@ base::string16 GetSafetyTipDescription(
int GetSafetyTipLeaveButtonId(security_state::SafetyTipStatus warning_type) {
switch (warning_type) {
#if defined(OS_ANDROID)
case security_state::SafetyTipStatus::kBadReputation:
return IDS_SAFETY_TIP_ANDROID_BAD_REPUTATION_LEAVE_BUTTON;
case security_state::SafetyTipStatus::kLookalike:
return IDS_SAFETY_TIP_ANDROID_LOOKALIKE_LEAVE_BUTTON;
#else
case security_state::SafetyTipStatus::kBadReputation:
return IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_LEAVE_BUTTON;
case security_state::SafetyTipStatus::kLookalike:
return IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_LEAVE_BUTTON;
#endif
case security_state::SafetyTipStatus::kBadReputationIgnored:
case security_state::SafetyTipStatus::kLookalikeIgnored:
case security_state::SafetyTipStatus::kBadKeyword:
......
components/security_interstitials_strings.grdp
View file @ a914abc0
......@@ -461,20 +461,6 @@
Hide advanced
</message>
<!-- Safety Tip summary strings for Android (Desktop is in page_info_strings.grdp) -->
<message name="IDS_SAFETY_TIP_ANDROID_BAD_REPUTATION_LEAVE_BUTTON" desc="Text of button to ignore the warning on a suspicious page. Shown on the safety tip infobar.">
Leave site
</message>
<message name="IDS_SAFETY_TIP_ANDROID_LOOKALIKE_LEAVE_BUTTON" desc="Text of button to leave a suspicious page. Shown on the safety tip infobar. Answers the question 'Did you mean example.com?'.">
Yes, continue
</message>
<message name="IDS_SAFETY_TIP_ANDROID_LOOKALIKE_TITLE" desc="Title of Safety Tip infobar on a domain that looks like another domain.">
Did you mean <ph name='SUGGESTED_DOMAIN'>$1<ex>google.com</ex></ph>?
</message>
<message name="IDS_SAFETY_TIP_ANDROID_LOOKALIKE_DESCRIPTION" desc="Body of an infobar warning when the user visits a page that triggered a Safety Tip because the domain looked like another domain.">
Attackers sometimes mimic sites by making hard-to-see-changes to the web address.
</message>
<if expr="not is_ios">
<!-- Blocked interception interstitial strings -->
<message name="IDS_BLOCKED_INTERCEPTION_HEADING" desc="Large heading of the known interception interstitial.">
......
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