Network connectivity errors handling (incl. CP) for enrollment flow

chrome/browser/ui/webui/chromeos/login/error_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
index 94014deb68e9fc8839144ff3a0fdfcd72a8d8ad7..c419dcf6a74049153349272a6aa9866d807feaa8 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
@@ -34,6 +34,9 @@ class ErrorScreenHandler : public BaseScreenHandler,
   virtual void SetDelegate(ErrorScreenActorDelegate* delegate) OVERRIDE;
   virtual void Show(OobeDisplay::Screen parent_screen,
                     base::DictionaryValue* params) OVERRIDE;
+  virtual void Show(OobeDisplay::Screen parent_screen,
+                    base::DictionaryValue* params,
+                    const base::Closure& on_hide) OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void FixCaptivePortal() OVERRIDE;
   virtual void ShowCaptivePortal() OVERRIDE;
@@ -51,6 +54,9 @@ class ErrorScreenHandler : public BaseScreenHandler,
 
   bool GetScreenName(OobeUI::Screen screen, std::string* name) const;
 
+  // Default hide_closure for Show/Hide.
+  void CheckAndShowScreen();
+
   // WebUI message handlers.
   void HandleShowCaptivePortal();
   void HandleHideCaptivePortal();
@@ -82,6 +88,10 @@ class ErrorScreenHandler : public BaseScreenHandler,
   // Keeps whether screen should be shown right after initialization.
   bool show_on_init_;
 
+  scoped_ptr<base::Closure> on_hide_;
+
+  base::WeakPtrFactory<ErrorScreenHandler> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ErrorScreenHandler);
 };