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

Unified Diff: chrome/browser/chromeos/login/app_launch_controller.cc

Issue 982993002: Tentative fix for the crash when calling StartupAppLauncher::ContinueWithNetworkReady by clear the … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clear network wait timer before starting launch_splash_timer. Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/app_launch_controller.cc
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
index 041da49d36c2ef8637cca5cecef031fb0759b455..b896293ce422618bfa453582908d97038180865a 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -266,7 +266,13 @@ void AppLaunchController::OnProfileLoadFailed(
OnLaunchFailed(error);
}
+void AppLaunchController::ClearNetworkWaitTimer() {
+ waiting_for_network_ = false;
+ network_wait_timer_.Stop();
+}
+
void AppLaunchController::CleanUp() {
+ ClearNetworkWaitTimer();
kiosk_profile_loader_.reset();
startup_app_launcher_.reset();
splash_wait_timer_.Stop();
@@ -370,8 +376,7 @@ void AppLaunchController::OnInstallingApp() {
app_launch_splash_screen_actor_->UpdateAppLaunchState(
AppLaunchSplashScreenActor::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
- waiting_for_network_ = false;
- network_wait_timer_.Stop();
+ ClearNetworkWaitTimer();
app_launch_splash_screen_actor_->ToggleNetworkConfig(false);
// We have connectivity at this point, so we can skip the network
@@ -395,6 +400,8 @@ void AppLaunchController::OnReadyToLaunch() {
if (splash_wait_timer_.IsRunning())
return;
+ ClearNetworkWaitTimer();
+
const int64 time_taken_ms = (base::TimeTicks::Now() -
base::TimeTicks::FromInternalValue(launch_splash_start_time_)).
InMilliseconds();
« 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