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

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

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 24 matching lines @@
 
 }  // namespace
 
 namespace chromeos {
 
 ErrorScreenHandler::ErrorScreenHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer)
     : BaseScreenHandler(kJsScreenPath),
       delegate_(NULL),
       network_state_informer_(network_state_informer),
-      show_on_init_(false) {
+      show_on_init_(false),
+      weak_ptr_factory_(this) {
   DCHECK(network_state_informer_.get());
 }
 
 ErrorScreenHandler::~ErrorScreenHandler() {}
 
 void ErrorScreenHandler::SetDelegate(ErrorScreenActorDelegate* delegate) {
   delegate_ = delegate;
 }
 
 void ErrorScreenHandler::Show(OobeDisplay::Screen parent_screen,
-                              base::DictionaryValue* params) {
+                              base::DictionaryValue* params,
+                              const base::Closure& on_hide) {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
   parent_screen_ = parent_screen;
+  on_hide_.reset(new base::Closure(on_hide));
   ShowScreen(OobeUI::kScreenErrorMessage, params);
   NetworkErrorShown();
   NetworkPortalDetector::Get()->SetStrategy(
       PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN);
   if (delegate_)
     delegate_->OnErrorShow();
   LOG(WARNING) << "Offline message is displayed";
 }
 
+void ErrorScreenHandler::CheckAndShowScreen() {
+  std::string screen_name;
+  if (GetScreenName(parent_screen(), &screen_name))
+    ShowScreen(screen_name.c_str(), NULL);
+}
+
+void ErrorScreenHandler::Show(OobeDisplay::Screen parent_screen,
+                              base::DictionaryValue* params) {
+  Show(parent_screen,
+       params,
+       base::Bind(&ErrorScreenHandler::CheckAndShowScreen,
+                  weak_ptr_factory_.GetWeakPtr()));
+}
+
 void ErrorScreenHandler::Hide() {
   if (parent_screen_ == OobeUI::SCREEN_UNKNOWN)
     return;
-  std::string screen_name;
-  if (GetScreenName(parent_screen_, &screen_name))
-    ShowScreen(screen_name.c_str(), NULL);
+  if (on_hide_)
+    on_hide_->Run();
   NetworkPortalDetector::Get()->SetStrategy(
       PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN);
   if (delegate_)
     delegate_->OnErrorHide();
   LOG(WARNING) << "Offline message is hidden";
 }
 
 void ErrorScreenHandler::FixCaptivePortal() {
   if (!captive_portal_window_proxy_.get()) {
     content::WebContents* web_contents =
@@ skipping 184 matching lines @@
     params.SetString("network", network_);
     params.SetBoolean("guestSigninAllowed", guest_signin_allowed_);
     params.SetBoolean("offlineLoginAllowed", offline_login_allowed_);
     params.SetBoolean("showConnectingIndicator", show_connecting_indicator_);
     Show(parent_screen_, &params);
     show_on_init_ = false;
   }
 }
 
 }  // namespace chromeos