kiosk: Fix StartupAppLauncher::LaunchApp crash.

chrome/browser/chromeos/login/app_launch_controller.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
 #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 
 namespace chromeos {
 
 class LoginDisplayHost;
 class OobeDisplay;
 class UserManager;
 
 // Controller for the kiosk app launch process, responsible for
 // coordinating loading the kiosk profile, launching the app, and
 // updating the splash screen UI.
 class AppLaunchController
-    : public base::SupportsWeakPtr<AppLaunchController>,
-      public AppLaunchSplashScreenActor::Delegate,
+    : public AppLaunchSplashScreenActor::Delegate,
       public KioskProfileLoader::Delegate,
       public StartupAppLauncher::Delegate,
       public AppLaunchSigninScreen::Delegate,
       public content::NotificationObserver {
  public:
   typedef base::Callback<bool()> ReturnBoolCallback;
 
   AppLaunchController(const std::string& app_id,
                       LoginDisplayHost* host,
                       OobeDisplay* oobe_display);
@@ skipping 68 matching lines @@
   AppLaunchSplashScreenActor* app_launch_splash_screen_actor_;
   scoped_ptr<KioskProfileLoader> kiosk_profile_loader_;
   scoped_ptr<StartupAppLauncher> startup_app_launcher_;
   scoped_ptr<AppLaunchSigninScreen> signin_screen_;
   scoped_ptr<AppWindowWatcher> app_window_watcher_;
 
   content::NotificationRegistrar registrar_;
   bool webui_visible_;
   bool launcher_ready_;
 
+  // A timer to ensure the app splash is shown for a minimum amount of time.
+  base::OneShotTimer<AppLaunchController> splash_wait_timer_;
+
   base::OneShotTimer<AppLaunchController> network_wait_timer_;
   bool waiting_for_network_;
   bool network_wait_timedout_;
   bool showing_network_dialog_;
   int64 launch_splash_start_time_;
 
   static bool skip_splash_wait_;
   static int network_wait_time_;
   static base::Closure* network_timeout_callback_;
   static ReturnBoolCallback* can_configure_network_callback_;
   static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_