cros: Cleanup lock screen and OOBE C++ backing code.

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

 // Copyright 2013 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/app_launch_splash_screen_handler.h"
 
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/screens/network_error.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ skipping 166 matching lines @@
           NetworkError::ERROR_STATE_KIOSK_ONLINE, network_name);
       break;
     }
     default:
       network_error_model_->SetErrorState(NetworkError::ERROR_STATE_OFFLINE,
                                           network_name);
       NOTREACHED();
       break;
   }
 
-  OobeScreen screen = OobeScreen::SCREEN_UNKNOWN;
-  OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController());
-  if (oobe_ui)
-    screen = oobe_ui->current_screen();
-
-  if (screen != OobeScreen::SCREEN_ERROR_MESSAGE)
+  if (GetCurrentScreen() != OobeScreen::SCREEN_ERROR_MESSAGE)
     network_error_model_->SetParentScreen(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
   network_error_model_->Show();
 }
 
 bool AppLaunchSplashScreenHandler::IsNetworkReady() {
   return network_state_informer_->state() == NetworkStateInformer::ONLINE;
 }
 
 void AppLaunchSplashScreenHandler::OnNetworkReady() {
   // Purposely leave blank because the online case is handled in UpdateState
@@ skipping 83 matching lines @@
   DCHECK(online_state_);
   if (delegate_ && online_state_) {
     network_config_requested_ = false;
     network_config_done_ = true;
     delegate_->OnNetworkConfigRequested(false);
     Show(app_id_);
   }
 }
 
 }  // namespace chromeos