Add custom interstitial for captive portals.

chrome/browser/ssl/captive_portal_blocking_page.cc

+// Copyright 2014 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 "chrome/browser/ssl/captive_portal_blocking_page.h"
+
+#include "base/metrics/histogram.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/web_contents.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+
+#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
+#endif
+
+namespace {
+
+// Events for UMA.
+enum CaptivePortalBlockingPageEvent {
+  SHOW_ALL,
+  OPEN_LOGIN_PAGE,
+  CAPTIVE_PORTAL_BLOCKING_PAGE_EVENT_COUNT
+};
+
+void RecordUMA(CaptivePortalBlockingPageEvent event) {
+  UMA_HISTOGRAM_ENUMERATION("interstitial.captive_portal",
+                            event,
+                            CAPTIVE_PORTAL_BLOCKING_PAGE_EVENT_COUNT);
+}
+
+const char kOpenLoginPageCommand[] = "openLoginPage";
+
+} // namespace
+
+// static
+const void* CaptivePortalBlockingPage::kTypeForTesting =
+    &CaptivePortalBlockingPage::kTypeForTesting;
+
+CaptivePortalBlockingPage::CaptivePortalBlockingPage(
+    content::WebContents* web_contents,
+    const GURL& request_url)
+    : SecurityInterstitialPage(web_contents, request_url) {
+  RecordUMA(SHOW_ALL);
+}
+
+CaptivePortalBlockingPage::~CaptivePortalBlockingPage() {
+}
+
+const void* CaptivePortalBlockingPage::GetTypeForTesting() const {
+  return CaptivePortalBlockingPage::kTypeForTesting;
+}
+
+bool CaptivePortalBlockingPage::ShouldCreateNewNavigation() const {
+  return true;
+}
+
+void CaptivePortalBlockingPage::PopulateInterstitialStrings(
+    base::DictionaryValue* load_time_data) {
+

[mmenke, 2014/11/26 18:57:48]

nit:  Remove blank line

[meacer, 2014/12/08 22:29:50]

Done.

+  load_time_data->SetString("iconClass", "icon-offline");
+  load_time_data->SetString("type", "CAPTIVE_PORTAL");
+  load_time_data->SetBoolean("overridable", false);
+
+  load_time_data->SetString(
+      "primaryButtonText",
+      l10n_util::GetStringUTF16(IDS_CAPTIVE_PORTAL_BUTTON_OPEN_LOGIN_PAGE));
+  load_time_data->SetString("tabTitle",
+      l10n_util::GetStringUTF16(IDS_CAPTIVE_PORTAL_TITLE));
+  load_time_data->SetString(
+      "primaryParagraph",
+      l10n_util::GetStringUTF16(IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH));
+  load_time_data->SetString("heading",
+      l10n_util::GetStringUTF16(IDS_CAPTIVE_PORTAL_HEADING));
+
+  // Fill the empty strings to avoid getting debug warnings.
+  load_time_data->SetString("openDetails", base::string16());
+  load_time_data->SetString("closeDetails", base::string16());
+  load_time_data->SetString("explanationParagraph", base::string16());
+  load_time_data->SetString("finalParagraph", base::string16());

[mmenke, 2014/11/26 18:57:48]

If you us jscontent=blah rather than i18n-values=".innerHTML: blah", this
shouldn't be necessary (Or if you need HTML support, i18n-values=".innerHTML:
blah ? blah : ''").  If you don't need HTML, though, suggest not allowing it).

Think requiring these all be kept in sync to avoid Javascript warnings doesn't
work that well, unless you have browser tests for that.

[meacer, 2014/12/08 22:29:50]

We'll be refactoring the interstitials further in this quarter or the next, I'll
put this in the todo list. For now both SSL and SB interstitials use this
mechanism so I'd like to keep it consistent.

+}
+
+void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
+  // The response has quotes around it.
+  if (command == std::string("\"") + kOpenLoginPageCommand + "\"") {
+    RecordUMA(OPEN_LOGIN_PAGE);
+#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+    CaptivePortalTabHelper::OpenLoginTabForWebContents(web_contents(), true);
+#endif
+  }
+}