Add custom interstitial for captive portals.

chrome/browser/captive_portal/captive_portal_tab_helper.h

 // Copyright (c) 2012 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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/resource_type.h"
 
 class GURL;
 class Profile;
 
 namespace content {
-  class WebContents;
+class WebContents;
 }
 
 namespace net {
 class SSLInfo;
 }
 
 class CaptivePortalLoginDetector;
 class CaptivePortalTabReloader;
 
 // Along with the classes it owns, responsible for detecting page loads broken
@@ skipping 54 matching lines @@
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Called when a certificate interstitial error page is about to be shown.
   void OnSSLCertError(const net::SSLInfo& ssl_info);
 
   // A "Login Tab" is a tab that was originally at a captive portal login
   // page.  This is set to false when a captive portal is no longer detected.
   bool IsLoginTab() const;
 
+  // Returns the delay to show an SSL interstitial if a cert error occurs.
+  base::TimeDelta GetSSLErrorDelay() const;
+
+  // Opens a login tab if the profile's active window doesn't have one already.
+  static void OpenLoginTabForWebContents(content::WebContents* web_contents,
+                                         bool focus);
+
  private:
   friend class CaptivePortalBrowserTest;
   friend class CaptivePortalTabHelperTest;
 
   friend class content::WebContentsUserData<CaptivePortalTabHelper>;
   explicit CaptivePortalTabHelper(content::WebContents* web_contents);
 
   // Called by Observe in response to the corresponding event.
   void OnRedirect(int child_id,
                   content::ResourceType resource_type,
                   const GURL& new_url);
 
   // Called by Observe in response to the corresponding event.
   void OnCaptivePortalResults(
       captive_portal::CaptivePortalResult previous_result,
       captive_portal::CaptivePortalResult result);
 
   void OnLoadAborted();
 
   // Called to indicate a tab is at, or is navigating to, the captive portal
   // login page.
   void SetIsLoginTab();
 
   // |this| takes ownership of |tab_reloader|.
   void SetTabReloaderForTest(CaptivePortalTabReloader* tab_reloader);
 
+  void SetSSLErrorDelayForTest(base::TimeDelta ssl_error_delay);
+
   const content::RenderViewHost* provisional_render_view_host() const {
     return provisional_render_view_host_;
   }
 
   CaptivePortalTabReloader* GetTabReloaderForTest();
 
-  // Opens a login tab if the profile's active window doesn't have one already.
-  void OpenLoginTab();
-
   Profile* profile_;
 
   // Neither of these will ever be NULL.
   scoped_ptr<CaptivePortalTabReloader> tab_reloader_;
   scoped_ptr<CaptivePortalLoginDetector> login_detector_;
 
   content::WebContents* web_contents_;
 
   // If a provisional load has failed, and the tab is loading an error page, the
   // error code associated with the error page we're loading.
   // net::OK, otherwise.
   int pending_error_code_;
 
+  base::TimeDelta ssl_error_delay_;

[mmenke, 2014/12/09 22:42:26]

As much as I dislike statics variables, I think this would make more sense as a
static member of SSLBlockingPage.  Per earlier comments, I think using this as a
settings object for SSLBlockingPage is weird.

[meacer, 2014/12/10 22:48:02]

Moved to SSLErrorHandler as a static variable.

+
   // The RenderViewHost with a provisional load, if any.  Can either be
   // the currently displayed RenderViewHost or a pending RenderViewHost for
   // cross-process navitations.  NULL when there's currently no provisional
   // load.
   content::RenderViewHost* provisional_render_view_host_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
 };
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_