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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_controller.cc

Issue 149843004: kiosk: Skip network check for offline enabled app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 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 | Annotate | Revision Log
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/chromeos/login/app_launch_controller.h" 5 #include "chrome/browser/chromeos/login/app_launch_controller.h"
6 6
7 #include "apps/shell_window_registry.h" 7 #include "apps/shell_window_registry.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 waiting_for_network_ = true; 297 waiting_for_network_ = true;
298 network_wait_timer_.Start( 298 network_wait_timer_.Start(
299 FROM_HERE, 299 FROM_HERE,
300 base::TimeDelta::FromSeconds(network_wait_time_), 300 base::TimeDelta::FromSeconds(network_wait_time_),
301 this, &AppLaunchController::OnNetworkWaitTimedout); 301 this, &AppLaunchController::OnNetworkWaitTimedout);
302 302
303 app_launch_splash_screen_actor_->UpdateAppLaunchState( 303 app_launch_splash_screen_actor_->UpdateAppLaunchState(
304 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK); 304 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
305 } 305 }
306 306
307 bool AppLaunchController::IsNetworkReady() {
308 return app_launch_splash_screen_actor_->IsNetworkReady();
309 }
310
307 void AppLaunchController::OnLoadingOAuthFile() { 311 void AppLaunchController::OnLoadingOAuthFile() {
308 app_launch_splash_screen_actor_->UpdateAppLaunchState( 312 app_launch_splash_screen_actor_->UpdateAppLaunchState(
309 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE); 313 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
310 } 314 }
311 315
312 void AppLaunchController::OnInitializingTokenService() { 316 void AppLaunchController::OnInitializingTokenService() {
313 app_launch_splash_screen_actor_->UpdateAppLaunchState( 317 app_launch_splash_screen_actor_->UpdateAppLaunchState(
314 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE); 318 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
315 } 319 }
316 320
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 << ", error=" << error; 376 << ", error=" << error;
373 DCHECK_NE(KioskAppLaunchError::NONE, error); 377 DCHECK_NE(KioskAppLaunchError::NONE, error);
374 378
375 // Saves the error and ends the session to go back to login screen. 379 // Saves the error and ends the session to go back to login screen.
376 KioskAppLaunchError::Save(error); 380 KioskAppLaunchError::Save(error);
377 chrome::AttemptUserExit(); 381 chrome::AttemptUserExit();
378 CleanUp(); 382 CleanUp();
379 } 383 }
380 384
381 } // namespace chromeos 385 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.h ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698