Make interstitial links open in a new tab

components/security_interstitials/core/safe_browsing_loud_error_ui.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/security_interstitials/core/safe_browsing_loud_error_ui.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/grit/components_resources.h"
 #include "components/security_interstitials/core/common_string_util.h"
 #include "components/security_interstitials/core/metrics_helper.h"
 #include "components/strings/grit/components_strings.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace security_interstitials {
 namespace {
 
-// URL for the Help Center
-const char kLearnMore[] = "https://support.google.com/chrome/";
-
 // For malware interstitial pages, we link the problematic URL to Google's
 // diagnostic page.
 #if defined(GOOGLE_CHROME_BUILD)
 const char kSbDiagnosticUrl[] =
     "https://www.google.com/safebrowsing/"
     "diagnostic?site=%s&client=googlechrome";
 #else
 const char kSbDiagnosticUrl[] =
     "https://www.google.com/safebrowsing/diagnostic?site=%s&client=chromium";
 #endif
@@ skipping 27 matching lines @@
     : BaseSafeBrowsingErrorUI(request_url,
                               main_frame_url,
                               reason,
                               display_options,
                               app_locale,
                               time_triggered,
                               controller) {
   controller->metrics_helper()->RecordUserDecision(MetricsHelper::SHOW);
   controller->metrics_helper()->RecordUserInteraction(
       MetricsHelper::TOTAL_VISITS);
-  if (is_proceed_anyway_disabled())
+  if (is_proceed_anyway_disabled()) {
     controller->metrics_helper()->RecordUserDecision(
         security_interstitials::MetricsHelper::PROCEEDING_DISABLED);
+  }
 }
 
 SafeBrowsingLoudErrorUI::~SafeBrowsingLoudErrorUI() {
   controller()->metrics_helper()->RecordShutdownMetrics();
 }
 
 void SafeBrowsingLoudErrorUI::PopulateStringsForHtml(
     base::DictionaryValue* load_time_data) {
   DCHECK(load_time_data);
 
@@ skipping 72 matching lines @@
     }
     case CMD_SHOW_MORE_SECTION: {
       controller()->metrics_helper()->RecordUserInteraction(
           security_interstitials::MetricsHelper::SHOW_ADVANCED);
       break;
     }
     case CMD_OPEN_HELP_CENTER: {
       // User pressed "Learn more".
       controller()->metrics_helper()->RecordUserInteraction(
           security_interstitials::MetricsHelper::SHOW_LEARN_MORE);
-      GURL learn_more_url(kLearnMore);
+
+      GURL learn_more_url = controller()->GetBaseHelpCenterUrl();
       learn_more_url = net::AppendQueryParameter(
           learn_more_url, "p", get_help_center_article_link());
       learn_more_url =
           google_util::AppendGoogleLocaleParam(learn_more_url, app_locale());
-      controller()->OpenUrlInCurrentTab(learn_more_url);
+      OpenURL(learn_more_url);
       break;
     }
     case CMD_RELOAD: {
       controller()->metrics_helper()->RecordUserInteraction(
           security_interstitials::MetricsHelper::RELOAD);
       controller()->Reload();
       break;
     }
     case CMD_OPEN_REPORTING_PRIVACY: {
       // User pressed on the SB Extended Reporting "privacy policy" link.
       controller()->OpenExtendedReportingPrivacyPolicy();
       break;
     }
     case CMD_OPEN_WHITEPAPER: {
       controller()->OpenExtendedReportingWhitepaper();
       break;
     }
     case CMD_OPEN_DIAGNOSTIC: {
       controller()->metrics_helper()->RecordUserInteraction(
           security_interstitials::MetricsHelper::SHOW_DIAGNOSTIC);
       std::string diagnostic = base::StringPrintf(
           kSbDiagnosticUrl,
           net::EscapeQueryParamValue(request_url().spec(), true).c_str());
       GURL diagnostic_url(diagnostic);
       diagnostic_url =
           google_util::AppendGoogleLocaleParam(diagnostic_url, app_locale());
-      controller()->OpenUrlInCurrentTab(diagnostic_url);
+      OpenURL(diagnostic_url);
       break;
     }
     case CMD_REPORT_PHISHING_ERROR: {
       controller()->metrics_helper()->RecordUserInteraction(
           security_interstitials::MetricsHelper::REPORT_PHISHING_ERROR);
       GURL phishing_error_url(kReportPhishingErrorUrl);
       phishing_error_url = google_util::AppendGoogleLocaleParam(
           phishing_error_url, app_locale());
-      controller()->OpenUrlInCurrentTab(phishing_error_url);
+      OpenURL(phishing_error_url);
       break;
     }
     case CMD_OPEN_DATE_SETTINGS:
     case CMD_OPEN_LOGIN:
     case CMD_ERROR:
     case CMD_TEXT_FOUND:
     case CMD_TEXT_NOT_FOUND:
       break;
   }
 }
@@ skipping 61 matching lines @@
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringUTF16(IDS_PHISHING_V4_PROCEED_AND_REPORT_PARAGRAPH));
 }
 
 void SafeBrowsingLoudErrorUI::PopulateExtendedReportingOption(
     base::DictionaryValue* load_time_data) {
   bool can_show_extended_reporting_option = CanShowExtendedReportingOption();
   load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox,
                              can_show_extended_reporting_option);
-  if (!can_show_extended_reporting_option)
+  if (!can_show_extended_reporting_option) {
     return;
+  }
 
   const std::string privacy_link = base::StringPrintf(
       security_interstitials::kPrivacyLinkHtml,
       security_interstitials::CMD_OPEN_REPORTING_PRIVACY,
       l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
   load_time_data->SetString(security_interstitials::kOptInLink,
                             l10n_util::GetStringFUTF16(
                                 is_scout_reporting_enabled()
                                     ? IDS_SAFE_BROWSING_SCOUT_REPORTING_AGREE
                                     : IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
                                 base::UTF8ToUTF16(privacy_link)));
   load_time_data->SetBoolean(security_interstitials::kBoxChecked,
                              is_extended_reporting_enabled());
 }
 
+void SafeBrowsingLoudErrorUI::OpenURL(const GURL& url) {
+  if (should_open_links_in_new_tab()) {
+    controller()->OpenUrlInNewForegroundTab(url);
+  } else {
+    controller()->OpenUrlInCurrentTab(url);
+  }
+}
+
 int SafeBrowsingLoudErrorUI::GetHTMLTemplateId() const {
   return IDR_SECURITY_INTERSTITIAL_HTML;
 };
 
 }  // security_interstitials