Add custom interstitial for captive portals.

chrome/browser/ssl/ssl_error_handler.h

+// 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.
+
+#ifndef CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
+#define CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
+
+#include <string>
+
+#include "base/callback_forward.h"
+#include "base/macros.h"
+#include "base/timer/timer.h"
+#include "chrome/browser/chrome_notification_types.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "net/ssl/ssl_info.h"
+#include "url/gurl.h"
+
+namespace content {
+class RenderViewHost;
+class WebContents;
+}
+
+// This class is responsible for deciding whether to show an SSL warning or a
+// captive portal error page.

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

Should give details on how it does this...The asynchronous decision making is
pretty important, and not obvious without digging into the class.

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

Done.

+// It deletes itself when the interstitial page is closed.

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

nit:  Somewhat weird to use a double break between paragraphs below, but not
here.  Suggest either adding a blank comment line separating it from the one
above, or merging it into the previous paragraph.

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

Done.

+//
+// This class should only be used on the UI thread because its implementation
+// uses captive_portal::CaptivePortalService which can only be accessed on the
+// UI thread.
+class SSLErrorHandler : public content::WebContentsObserver,
+                        public content::NotificationObserver {
+ public:
+  SSLErrorHandler(content::WebContents* web_contents,
+                  int cert_error,
+                  const net::SSLInfo& ssl_info,
+                  const GURL& request_url,
+                  int options_mask,
+                  const base::TimeDelta ssl_error_delay,
+                  const base::Callback<void(bool)>& callback);
+  ~SSLErrorHandler() override;
+
+  static void HandleSSLError(content::WebContents* web_contents,
+                             int cert_error,
+                             const net::SSLInfo& ssl_info,
+                             const GURL& request_url,
+                             int options_mask,
+                             const base::Callback<void(bool)>& callback);
+
+ private:
+  void Handle();

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

"Handle" is a rather unclear...  Suggest just HandleError or OnError or
somesuch.  "On" may be a little better than "Handle" since it may not actually
"handle" the error, bur rather wait for for the captive portal check to
complete.

Or maybe "StartHandlingError" or somesuch.

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

I like "StartHandlingError".

+  void OnTimerExpired();

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

Should document these methods.

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

Done.

+
+  // These are virtual for tests:
+  virtual void CheckForCaptivePortal();
+  virtual void ShowCaptivePortalInterstitial();
+  virtual void ShowSSLInterstitial();
+
+  // content::NotificationObserver:
+  void Observe(
+      int type,
+      const content::NotificationSource& source,
+      const content::NotificationDetails& details) override;
+
+  // content::WebContentsObserver:
+  void DidStartNavigationToPendingEntry(
+      const GURL& url,
+      content::NavigationController::ReloadType reload_type) override;
+  void DidStopLoading(
+      content::RenderViewHost* render_view_host) override;
+  void WebContentsDestroyed() override;
+
+  content::WebContents* web_contents_;

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

Not needed.  See WebContentsObserver::web_contents()

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

Done.

+  const int cert_error_;
+  const net::SSLInfo ssl_info_;
+  const GURL request_url_;
+  const int options_mask_;
+  const base::Callback<void(bool)> callback_;
+
+  // Time to wait before displaying the SSL interstitial. If a captive portal
+  // arrives before this, the captive portal interstitial is displayed instead.
+  base::TimeDelta ssl_interstitial_display_delay_;
+  content::NotificationRegistrar registrar_;
+  base::OneShotTimer<SSLErrorHandler> timer_;
+
+  friend class TestSSLErrorHandler;
+
+  DISALLOW_COPY_AND_ASSIGN(SSLErrorHandler);
+};
+
+#endif  // CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_