| Index: chrome/browser/chromeos/app_mode/app_launch_utils.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/app_launch_utils.cc b/chrome/browser/chromeos/app_mode/app_launch_utils.cc
|
| index ebbf05354db0ddb766e5f14d296ddae737c6d53d..d5a4c491b592b8db173de89560fe76f9b3ac9c88 100644
|
| --- a/chrome/browser/chromeos/app_mode/app_launch_utils.cc
|
| +++ b/chrome/browser/chromeos/app_mode/app_launch_utils.cc
|
| @@ -27,34 +27,32 @@ class AppLaunchManager : public StartupAppLauncher::Delegate {
|
| }
|
|
|
| private:
|
| - virtual ~AppLaunchManager() {}
|
| + ~AppLaunchManager() override {}
|
|
|
| void Cleanup() { delete this; }
|
|
|
| // StartupAppLauncher::Delegate overrides:
|
| - virtual void InitializeNetwork() override {
|
| + void InitializeNetwork() override {
|
| // This is on crash-restart path and assumes network is online.
|
| // TODO(xiyuan): Remove the crash-restart path for kiosk or add proper
|
| // network configure handling.
|
| startup_app_launcher_->ContinueWithNetworkReady();
|
| }
|
| - virtual bool IsNetworkReady() override {
|
| + bool IsNetworkReady() override {
|
| // See comments above. Network is assumed to be online here.
|
| return true;
|
| }
|
| - virtual void OnLoadingOAuthFile() override {}
|
| - virtual void OnInitializingTokenService() override {}
|
| - virtual void OnInstallingApp() override {}
|
| - virtual void OnReadyToLaunch() override {
|
| - startup_app_launcher_->LaunchApp();
|
| - }
|
| - virtual void OnLaunchSucceeded() override { Cleanup(); }
|
| - virtual void OnLaunchFailed(KioskAppLaunchError::Error error) override {
|
| + void OnLoadingOAuthFile() override {}
|
| + void OnInitializingTokenService() override {}
|
| + void OnInstallingApp() override {}
|
| + void OnReadyToLaunch() override { startup_app_launcher_->LaunchApp(); }
|
| + void OnLaunchSucceeded() override { Cleanup(); }
|
| + void OnLaunchFailed(KioskAppLaunchError::Error error) override {
|
| KioskAppLaunchError::Save(error);
|
| chrome::AttemptUserExit();
|
| Cleanup();
|
| }
|
| - virtual bool IsShowingNetworkConfigScreen() override { return false; }
|
| + bool IsShowingNetworkConfigScreen() override { return false; }
|
|
|
| scoped_ptr<StartupAppLauncher> startup_app_launcher_;
|
|
|
|
|