Index: chrome/browser/ssl/bad_clock_blocking_page.cc |
diff --git a/chrome/browser/ssl/bad_clock_blocking_page.cc b/chrome/browser/ssl/bad_clock_blocking_page.cc |
index a3b3a7b5f827a673487d62c5e6f768e0e94d7d9f..420045a01eb543da7e2226bdcce136b679a2089f 100644 |
--- a/chrome/browser/ssl/bad_clock_blocking_page.cc |
+++ b/chrome/browser/ssl/bad_clock_blocking_page.cc |
@@ -4,34 +4,19 @@ |
#include "chrome/browser/ssl/bad_clock_blocking_page.h" |
-#include "base/bind.h" |
-#include "base/bind_helpers.h" |
-#include "base/build_time.h" |
#include "base/callback_helpers.h" |
-#include "base/command_line.h" |
-#include "base/files/file_util.h" |
-#include "base/i18n/rtl.h" |
-#include "base/i18n/time_formatting.h" |
-#include "base/process/launch.h" |
+#include "base/prefs/pref_service.h" |
#include "base/strings/string_number_conversions.h" |
-#include "base/strings/string_piece.h" |
-#include "base/strings/string_util.h" |
-#include "base/strings/stringprintf.h" |
-#include "base/strings/utf_string_conversions.h" |
-#include "base/time/time.h" |
-#include "base/values.h" |
-#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/interstitials/chrome_controller_client.h" |
#include "chrome/browser/interstitials/chrome_metrics_helper.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/renderer_preferences_util.h" |
#include "chrome/browser/ssl/cert_report_helper.h" |
#include "chrome/browser/ssl/ssl_cert_reporter.h" |
#include "chrome/common/pref_names.h" |
-#include "chrome/grit/generated_resources.h" |
-#include "components/google/core/browser/google_util.h" |
+#include "components/security_interstitials/core/bad_clock_ui.h" |
#include "components/security_interstitials/core/controller_client.h" |
-#include "components/ssl_errors/error_classification.h" |
-#include "content/public/browser/browser_thread.h" |
+#include "components/security_interstitials/core/metrics_helper.h" |
#include "content/public/browser/cert_store.h" |
#include "content/public/browser/interstitial_page.h" |
#include "content/public/browser/interstitial_page_delegate.h" |
@@ -43,33 +28,8 @@ |
#include "content/public/browser/web_contents.h" |
#include "content/public/common/renderer_preferences.h" |
#include "content/public/common/ssl_status.h" |
-#include "grit/browser_resources.h" |
-#include "grit/components_strings.h" |
#include "net/base/net_errors.h" |
-#include "net/base/net_util.h" |
-#include "net/cert/x509_certificate.h" |
-#include "ui/base/l10n/l10n_util.h" |
-#if defined(OS_ANDROID) |
-#include "chrome/browser/android/intent_helper.h" |
-#endif |
- |
-#if defined(OS_CHROMEOS) |
-#include "chrome/browser/profiles/profile_manager.h" |
-#include "chrome/browser/ui/chrome_pages.h" |
-#include "chrome/common/url_constants.h" |
-#endif |
- |
-#if defined(OS_WIN) |
-#include "base/base_paths_win.h" |
-#include "base/path_service.h" |
-#include "base/strings/string16.h" |
-#include "base/win/windows_version.h" |
-#endif |
- |
-using base::ASCIIToUTF16; |
-using base::TimeTicks; |
-using content::InterstitialPage; |
using content::InterstitialPageDelegate; |
using content::NavigationController; |
using content::NavigationEntry; |
@@ -78,92 +38,6 @@ namespace { |
const char kMetricsName[] = "bad_clock"; |
-void LaunchDateAndTimeSettings() { |
- DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
-// The code for each OS is completely separate, in order to avoid bugs like |
-// https://crbug.com/430877 . |
-#if defined(OS_ANDROID) |
- chrome::android::OpenDateAndTimeSettings(); |
- |
-#elif defined(OS_CHROMEOS) |
- std::string sub_page = |
- std::string(chrome::kSearchSubPage) + "#" + |
- l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME); |
- chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(), |
- sub_page); |
- |
-#elif defined(OS_IOS) |
- // iOS does not have a way to launch the date and time settings. |
- NOTREACHED(); |
- |
-#elif defined(OS_LINUX) |
- struct ClockCommand { |
- const char* pathname; |
- const char* argument; |
- }; |
- static const ClockCommand kClockCommands[] = { |
- // Unity |
- {"/usr/bin/unity-control-center", "datetime"}, |
- // GNOME |
- // |
- // NOTE: On old Ubuntu, naming control panels doesn't work, so it |
- // opens the overview. This will have to be good enough. |
- {"/usr/bin/gnome-control-center", "datetime"}, |
- {"/usr/local/bin/gnome-control-center", "datetime"}, |
- {"/opt/bin/gnome-control-center", "datetime"}, |
- // KDE |
- {"/usr/bin/kcmshell4", "clock"}, |
- {"/usr/local/bin/kcmshell4", "clock"}, |
- {"/opt/bin/kcmshell4", "clock"}, |
- }; |
- |
- base::CommandLine command(base::FilePath("")); |
- for (const ClockCommand& cmd : kClockCommands) { |
- base::FilePath pathname(cmd.pathname); |
- if (base::PathExists(pathname)) { |
- command.SetProgram(pathname); |
- command.AppendArg(cmd.argument); |
- break; |
- } |
- } |
- if (command.GetProgram().empty()) { |
- // Alas, there is nothing we can do. |
- return; |
- } |
- |
- base::LaunchOptions options; |
- options.wait = false; |
- options.allow_new_privs = true; |
- base::LaunchProcess(command, options); |
- |
-#elif defined(OS_MACOSX) |
- base::CommandLine command(base::FilePath("/usr/bin/open")); |
- command.AppendArg("/System/Library/PreferencePanes/DateAndTime.prefPane"); |
- |
- base::LaunchOptions options; |
- options.wait = false; |
- base::LaunchProcess(command, options); |
- |
-#elif defined(OS_WIN) |
- base::FilePath path; |
- PathService::Get(base::DIR_SYSTEM, &path); |
- static const base::char16 kControlPanelExe[] = L"control.exe"; |
- path = path.Append(base::string16(kControlPanelExe)); |
- base::CommandLine command(path); |
- command.AppendArg(std::string("/name")); |
- command.AppendArg(std::string("Microsoft.DateAndTime")); |
- |
- base::LaunchOptions options; |
- options.wait = false; |
- base::LaunchProcess(command, options); |
- |
-#else |
- NOTREACHED(); |
- |
-#endif |
- // Don't add code here! (See the comment at the beginning of the function.) |
-} |
- |
} // namespace |
// static |
@@ -186,24 +60,40 @@ BadClockBlockingPage::BadClockBlockingPage( |
callback_(callback), |
cert_error_(cert_error), |
ssl_info_(ssl_info), |
- time_triggered_(time_triggered) { |
+ time_triggered_(time_triggered), |
+ controller_(new ChromeControllerClient(web_contents)) { |
+ // Get the language for the BadClockUI. |
+ std::string languages; |
+ Profile* profile = |
+ Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
+ if (profile) |
+ languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages); |
+ |
+ // Set up the metrics helper for the BadClockUI. |
security_interstitials::MetricsHelper::ReportDetails reporting_info; |
reporting_info.metric_prefix = kMetricsName; |
- scoped_ptr<ChromeMetricsHelper> chrome_metrics_helper(new ChromeMetricsHelper( |
- web_contents, request_url, reporting_info, kMetricsName)); |
+ ChromeMetricsHelper* chrome_metrics_helper = new ChromeMetricsHelper( |
+ web_contents, request_url, reporting_info, kMetricsName); |
chrome_metrics_helper->StartRecordingCaptivePortalMetrics(false); |
- set_metrics_helper(chrome_metrics_helper.Pass()); |
- metrics_helper()->RecordUserInteraction( |
- security_interstitials::MetricsHelper::TOTAL_VISITS); |
+ scoped_ptr<security_interstitials::MetricsHelper> metrics_helper( |
+ chrome_metrics_helper); |
+ controller_->set_metrics_helper(metrics_helper.Pass()); |
cert_report_helper_.reset(new CertReportHelper( |
ssl_cert_reporter.Pass(), web_contents, request_url, ssl_info, |
certificate_reporting::ErrorReport::INTERSTITIAL_CLOCK, |
- false /* overridable */, metrics_helper())); |
+ false /* overridable */, controller_->metrics_helper())); |
- // TODO(felt): Separate the clock statistics from the main ssl statistics. |
- ssl_errors::RecordUMAStatistics(false, time_triggered_, request_url, |
- cert_error_, *ssl_info_.cert.get()); |
+ bad_clock_ui_.reset(new security_interstitials::BadClockUI( |
+ request_url, cert_error, ssl_info, time_triggered, languages, |
+ controller_.get())); |
+} |
+ |
+BadClockBlockingPage::~BadClockBlockingPage() { |
+ if (!callback_.is_null()) { |
+ // Deny when the page is closed. |
+ NotifyDenyCertificate(); |
+ } |
} |
bool BadClockBlockingPage::ShouldCreateNewNavigation() const { |
@@ -215,76 +105,13 @@ InterstitialPageDelegate::TypeID BadClockBlockingPage::GetTypeForTesting() |
return BadClockBlockingPage::kTypeForTesting; |
} |
-BadClockBlockingPage::~BadClockBlockingPage() { |
- metrics_helper()->RecordShutdownMetrics(); |
- if (!callback_.is_null()) { |
- // Deny when the page is closed. |
- NotifyDenyCertificate(); |
- } |
+void BadClockBlockingPage::AfterShow() { |
+ controller_->set_interstitial_page(interstitial_page()); |
} |
void BadClockBlockingPage::PopulateInterstitialStrings( |
base::DictionaryValue* load_time_data) { |
- CHECK(load_time_data); |
- base::string16 url(GetFormattedHostName()); |
- |
- // Values that are currently still shared with the SSL interstitial. |
- load_time_data->SetString("type", "SSL"); |
- load_time_data->SetString("errorCode", net::ErrorToString(cert_error_)); |
- load_time_data->SetString( |
- "openDetails", l10n_util::GetStringUTF16(IDS_SSL_OPEN_DETAILS_BUTTON)); |
- load_time_data->SetString( |
- "closeDetails", |
- l10n_util::GetStringUTF16(IDS_SSL_CLOSE_DETAILS_BUTTON)); |
- |
- // Strings for the bad clock warning specifically. |
- load_time_data->SetBoolean("bad_clock", true); |
- load_time_data->SetBoolean("overridable", false); |
-#if defined(OS_IOS) |
- load_time_data->SetBoolean("hide_primary_button", true); |
-#else |
- load_time_data->SetBoolean("hide_primary_button", false); |
-#endif |
- |
- int heading_string = ssl_errors::IsUserClockInTheFuture(time_triggered_) |
- ? IDS_CLOCK_ERROR_AHEAD_HEADING |
- : IDS_CLOCK_ERROR_BEHIND_HEADING; |
- |
- load_time_data->SetString("tabTitle", |
- l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_TITLE)); |
- load_time_data->SetString("heading", |
- l10n_util::GetStringUTF16(heading_string)); |
- load_time_data->SetString( |
- "primaryParagraph", |
- l10n_util::GetStringFUTF16( |
- IDS_CLOCK_ERROR_PRIMARY_PARAGRAPH, url, |
- base::TimeFormatFriendlyDateAndTime(time_triggered_))); |
- |
- load_time_data->SetString( |
- "primaryButtonText", |
- l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_UPDATE_DATE_AND_TIME)); |
- load_time_data->SetString( |
- "explanationParagraph", |
- l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_EXPLANATION)); |
- |
- // The interstitial template expects this string, but we're not using it. |
- load_time_data->SetString("finalParagraph", std::string()); |
- |
- // Set debugging information at the bottom of the warning. |
- load_time_data->SetString("subject", |
- ssl_info_.cert->subject().GetDisplayName()); |
- load_time_data->SetString("issuer", |
- ssl_info_.cert->issuer().GetDisplayName()); |
- load_time_data->SetString( |
- "expirationDate", |
- base::TimeFormatShortDate(ssl_info_.cert->valid_expiry())); |
- load_time_data->SetString("currentDate", |
- base::TimeFormatShortDate(time_triggered_)); |
- std::vector<std::string> encoded_chain; |
- ssl_info_.cert->GetPEMEncodedChain(&encoded_chain); |
- load_time_data->SetString( |
- "pem", base::JoinString(encoded_chain, base::StringPiece())); |
- |
+ bad_clock_ui_->PopulateStringsForHTML(load_time_data); |
cert_report_helper_->PopulateExtendedReportingOption(load_time_data); |
} |
@@ -315,7 +142,6 @@ void BadClockBlockingPage::SetSSLCertReporterForTesting( |
} |
// This handles the commands sent from the interstitial JavaScript. |
-// DO NOT reorder or change this logic without also changing the JavaScript! |
void BadClockBlockingPage::CommandReceived(const std::string& command) { |
if (command == "\"pageLoadComplete\"") { |
// content::WaitForRenderFrameReady sends this message when the page |
@@ -326,36 +152,9 @@ void BadClockBlockingPage::CommandReceived(const std::string& command) { |
int cmd = 0; |
bool retval = base::StringToInt(command, &cmd); |
DCHECK(retval); |
- switch (cmd) { |
- case security_interstitials::CMD_DONT_PROCEED: |
- interstitial_page()->DontProceed(); |
- break; |
- case security_interstitials::CMD_DO_REPORT: |
- SetReportingPreference(true); |
- break; |
- case security_interstitials::CMD_DONT_REPORT: |
- SetReportingPreference(false); |
- break; |
- case security_interstitials::CMD_SHOW_MORE_SECTION: |
- metrics_helper()->RecordUserInteraction( |
- security_interstitials::MetricsHelper::SHOW_ADVANCED); |
- break; |
- case security_interstitials::CMD_OPEN_DATE_SETTINGS: |
- metrics_helper()->RecordUserInteraction( |
- security_interstitials::MetricsHelper::OPEN_TIME_SETTINGS); |
- content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE, |
- base::Bind(&LaunchDateAndTimeSettings)); |
- break; |
- case security_interstitials::CMD_OPEN_REPORTING_PRIVACY: |
- OpenExtendedReportingPrivacyPolicy(); |
- break; |
- case security_interstitials::CMD_PROCEED: |
- case security_interstitials::CMD_OPEN_HELP_CENTER: |
- case security_interstitials::CMD_RELOAD: |
- case security_interstitials::CMD_OPEN_DIAGNOSTIC: |
- // Not supported for the bad clock interstitial. |
- NOTREACHED() << "Unexpected command: " << command; |
- } |
+ |
+ bad_clock_ui_->HandleCommand( |
+ static_cast<security_interstitials::SecurityInterstitialCommands>(cmd)); |
} |
void BadClockBlockingPage::OverrideRendererPrefs( |