Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(665)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

Issue 2151113002: kiosk: Show network config UI after profile load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add a state/message while waiting Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
6 6
7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
8 #include "chrome/browser/chromeos/login/screens/network_error.h" 8 #include "chrome/browser/chromeos/login/screens/network_error.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 // TODO(zelidrag): Add better string for this one than "Please wait..." 247 // TODO(zelidrag): Add better string for this one than "Please wait..."
248 return IDS_SYNC_SETUP_SPINNER_TITLE; 248 return IDS_SYNC_SETUP_SPINNER_TITLE;
249 case APP_LAUNCH_STATE_PREPARING_NETWORK: 249 case APP_LAUNCH_STATE_PREPARING_NETWORK:
250 return IDS_APP_START_NETWORK_WAIT_MESSAGE; 250 return IDS_APP_START_NETWORK_WAIT_MESSAGE;
251 case APP_LAUNCH_STATE_INSTALLING_APPLICATION: 251 case APP_LAUNCH_STATE_INSTALLING_APPLICATION:
252 return IDS_APP_START_APP_WAIT_MESSAGE; 252 return IDS_APP_START_APP_WAIT_MESSAGE;
253 case APP_LAUNCH_STATE_WAITING_APP_WINDOW: 253 case APP_LAUNCH_STATE_WAITING_APP_WINDOW:
254 return IDS_APP_START_WAIT_FOR_APP_WINDOW_MESSAGE; 254 return IDS_APP_START_WAIT_FOR_APP_WINDOW_MESSAGE;
255 case APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT: 255 case APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT:
256 return IDS_APP_START_NETWORK_WAIT_TIMEOUT_MESSAGE; 256 return IDS_APP_START_NETWORK_WAIT_TIMEOUT_MESSAGE;
257 case APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI:
258 return IDS_APP_START_SHOWING_NETWORK_CONFIGURE_UI_MESSAGE;
257 } 259 }
258 return IDS_APP_START_NETWORK_WAIT_MESSAGE; 260 return IDS_APP_START_NETWORK_WAIT_MESSAGE;
259 } 261 }
260 262
261 void AppLaunchSplashScreenHandler::HandleConfigureNetwork() { 263 void AppLaunchSplashScreenHandler::HandleConfigureNetwork() {
262 if (delegate_) 264 if (delegate_)
263 delegate_->OnConfigureNetwork(); 265 delegate_->OnConfigureNetwork();
264 else 266 else
265 LOG(WARNING) << "No delegate set to handle network configuration."; 267 LOG(WARNING) << "No delegate set to handle network configuration.";
266 } 268 }
(...skipping 17 matching lines...) Expand all
284 DCHECK(online_state_); 286 DCHECK(online_state_);
285 if (delegate_ && online_state_) { 287 if (delegate_ && online_state_) {
286 network_config_requested_ = false; 288 network_config_requested_ = false;
287 network_config_done_ = true; 289 network_config_done_ = true;
288 delegate_->OnNetworkConfigRequested(false); 290 delegate_->OnNetworkConfigRequested(false);
289 Show(app_id_); 291 Show(app_id_);
290 } 292 }
291 } 293 }
292 294
293 } // namespace chromeos 295 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698