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

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

Issue 2669203006: When restoring kiosk app after crash, skip app installation steps. Installed apps should already be… (Closed)
Patch Set: Created 3 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
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.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/chromeos/login/app_launch_controller.h" 5 #include "chrome/browser/chromeos/login/app_launch_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 this, &AppLaunchController::OnNetworkWaitTimedout); 407 this, &AppLaunchController::OnNetworkWaitTimedout);
408 408
409 app_launch_splash_screen_actor_->UpdateAppLaunchState( 409 app_launch_splash_screen_actor_->UpdateAppLaunchState(
410 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK); 410 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
411 } 411 }
412 412
413 bool AppLaunchController::IsNetworkReady() { 413 bool AppLaunchController::IsNetworkReady() {
414 return app_launch_splash_screen_actor_->IsNetworkReady(); 414 return app_launch_splash_screen_actor_->IsNetworkReady();
415 } 415 }
416 416
417 bool AppLaunchController::ShouldSkipAppInstallation() {
418 return false;
419 }
420
417 void AppLaunchController::OnLoadingOAuthFile() { 421 void AppLaunchController::OnLoadingOAuthFile() {
418 app_launch_splash_screen_actor_->UpdateAppLaunchState( 422 app_launch_splash_screen_actor_->UpdateAppLaunchState(
419 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE); 423 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
420 } 424 }
421 425
422 void AppLaunchController::OnInitializingTokenService() { 426 void AppLaunchController::OnInitializingTokenService() {
423 app_launch_splash_screen_actor_->UpdateAppLaunchState( 427 app_launch_splash_screen_actor_->UpdateAppLaunchState(
424 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE); 428 AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
425 } 429 }
426 430
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 KioskAppLaunchError::Save(error); 496 KioskAppLaunchError::Save(error);
493 chrome::AttemptUserExit(); 497 chrome::AttemptUserExit();
494 CleanUp(); 498 CleanUp();
495 } 499 }
496 500
497 bool AppLaunchController::IsShowingNetworkConfigScreen() { 501 bool AppLaunchController::IsShowingNetworkConfigScreen() {
498 return network_config_requested_; 502 return network_config_requested_;
499 } 503 }
500 504
501 } // namespace chromeos 505 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698