| Index: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| index 016c94a8aa36cb77c2d8e1ef05c600314367e5f9..1068d19f9cf271d3999093da0fd071e903b0a344 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| @@ -43,10 +43,7 @@
|
| show_on_init_(false),
|
| state_(APP_LAUNCH_STATE_LOADING_AUTH_FILE),
|
| network_state_informer_(network_state_informer),
|
| - error_screen_actor_(error_screen_actor),
|
| - online_state_(false),
|
| - network_config_done_(false),
|
| - network_config_requested_(false) {
|
| + error_screen_actor_(error_screen_actor) {
|
| network_state_informer_->AddObserver(this);
|
| }
|
|
|
| @@ -104,10 +101,6 @@
|
| &AppLaunchSplashScreenHandler::HandleConfigureNetwork);
|
| AddCallback("cancelAppLaunch",
|
| &AppLaunchSplashScreenHandler::HandleCancelAppLaunch);
|
| - AddCallback("continueAppLaunch",
|
| - &AppLaunchSplashScreenHandler::HandleContinueAppLaunch);
|
| - AddCallback("networkConfigRequest",
|
| - &AppLaunchSplashScreenHandler::HandleNetworkConfigRequested);
|
| }
|
|
|
| void AppLaunchSplashScreenHandler::PrepareToShow() {
|
| @@ -140,11 +133,8 @@
|
| void AppLaunchSplashScreenHandler::ShowNetworkConfigureUI() {
|
| NetworkStateInformer::State state = network_state_informer_->state();
|
| if (state == NetworkStateInformer::ONLINE) {
|
| - online_state_ = true;
|
| - if (!network_config_requested_) {
|
| - delegate_->OnNetworkStateChanged(true);
|
| - return;
|
| - }
|
| + delegate_->OnNetworkStateChanged(true);
|
| + return;
|
| }
|
|
|
| const std::string network_path = network_state_informer_->network_path();
|
| @@ -170,11 +160,6 @@
|
| case NetworkStateInformer::OFFLINE: {
|
| error_screen_actor_->SetErrorState(
|
| ErrorScreen::ERROR_STATE_OFFLINE, network_name);
|
| - break;
|
| - }
|
| - case NetworkStateInformer::ONLINE: {
|
| - error_screen_actor_->SetErrorState(
|
| - ErrorScreen::ERROR_STATE_KIOSK_ONLINE, network_name);
|
| break;
|
| }
|
| default:
|
| @@ -210,11 +195,8 @@
|
| return;
|
| }
|
|
|
| - bool new_online_state =
|
| - network_state_informer_->state() == NetworkStateInformer::ONLINE;
|
| - delegate_->OnNetworkStateChanged(new_online_state);
|
| -
|
| - online_state_ = new_online_state;
|
| + NetworkStateInformer::State state = network_state_informer_->state();
|
| + delegate_->OnNetworkStateChanged(state == NetworkStateInformer::ONLINE);
|
| }
|
|
|
| void AppLaunchSplashScreenHandler::PopulateAppInfo(
|
| @@ -271,22 +253,4 @@
|
| LOG(WARNING) << "No delegate set to handle cancel app launch";
|
| }
|
|
|
| -void AppLaunchSplashScreenHandler::HandleNetworkConfigRequested() {
|
| - if (!delegate_ || network_config_done_)
|
| - return;
|
| -
|
| - network_config_requested_ = true;
|
| - delegate_->OnNetworkConfigRequested(true);
|
| -}
|
| -
|
| -void AppLaunchSplashScreenHandler::HandleContinueAppLaunch() {
|
| - DCHECK(online_state_);
|
| - if (delegate_ && online_state_) {
|
| - network_config_requested_ = false;
|
| - network_config_done_ = true;
|
| - delegate_->OnNetworkConfigRequested(false);
|
| - Show(app_id_);
|
| - }
|
| -}
|
| -
|
| } // namespace chromeos
|
|
|