Componentize the bad clock blocking page

chrome/browser/interstitials/chrome_controller_client.h

Index: chrome/browser/interstitials/chrome_controller_client.h
diff --git a/chrome/browser/interstitials/chrome_controller_client.h b/chrome/browser/interstitials/chrome_controller_client.h
index 36342332b96a9be4e6977c6d2d8406dd013fb742..5599a440ef58cbd783d519655fb77150bb36fc67 100644
--- a/chrome/browser/interstitials/chrome_controller_client.h
+++ b/chrome/browser/interstitials/chrome_controller_client.h
@@ -7,10 +7,8 @@
 
 #include "base/macros.h"
 #include "components/security_interstitials/core/controller_client.h"
-
-namespace content {
-class WebContents;
-}
+#include "content/public/browser/interstitial_page.h"
+#include "content/public/browser/web_contents.h"

[estark, 2015/12/01 18:40:17]

can these be left as forward-declarations?

[felt, 2015/12/01 19:13:44]

Gah, I was just working in google3 where forward-declarations aren't allowed,
and I got the style guides mixed up. Will fix here and elsewhere.

 
 // Provides embedder-specific logic for the security error page controller.
 class ChromeControllerClient : public security_interstitials::ControllerClient {
@@ -18,6 +16,13 @@ class ChromeControllerClient : public security_interstitials::ControllerClient {
   explicit ChromeControllerClient(content::WebContents* web_contents);
   ~ChromeControllerClient() override;
 
+  void set_interstitial_page(content::InterstitialPage* interstitial_page);
+
+  // security_interstitials::ControllerClient overrides
+  bool CanLaunchDateAndTimeSettings() override;
+  void LaunchDateAndTimeSettings() override;
+  void GoBack() override;
+
  protected:
   // security_interstitials::ControllerClient overrides
   void OpenUrlInCurrentTab(const GURL& url) override;
@@ -27,6 +32,7 @@ class ChromeControllerClient : public security_interstitials::ControllerClient {
 
  private:
   content::WebContents* web_contents_;
+  content::InterstitialPage* interstitial_page_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeControllerClient);
 };