diff options
| author | achuith <achuith@chromium.org> | 2015-02-03 10:28:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-03 18:29:36 +0000 |
| commit | 3c6b069609a097718fa089cbf2d9549e959d87d5 (patch) | |
| tree | 996be25fb4d4f615852e13435ae093b4e56b0946 /chrome/browser/chromeos/app_mode | |
| parent | 8c46f7e14826aff30a5fe3bb0751380e0078609d (diff) | |
| download | chromium_src-3c6b069609a097718fa089cbf2d9549e959d87d5.zip chromium_src-3c6b069609a097718fa089cbf2d9549e959d87d5.tar.gz chromium_src-3c6b069609a097718fa089cbf2d9549e959d87d5.tar.bz2 | |
Wait for pending extensions before launching kiosk app.
BUG=431934
TEST=browser tests
Review URL: https://codereview.chromium.org/860273006
Cr-Commit-Position: refs/heads/master@{#314371}
Diffstat (limited to 'chrome/browser/chromeos/app_mode')
| -rw-r--r-- | chrome/browser/chromeos/app_mode/startup_app_launcher.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc index 4bdd7dd..a7652a3 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc @@ -272,8 +272,13 @@ void StartupAppLauncher::MaybeLaunchApp() { void StartupAppLauncher::OnFinishCrxInstall(const std::string& extension_id, bool success) { - if (extension_id != app_id_) + // Wait for pending updates or dependent extensions to download. + if (extensions::ExtensionSystem::Get(profile_) + ->extension_service() + ->pending_extension_manager() + ->HasPendingExtensions()) { return; + } extensions::InstallTracker* tracker = extensions::InstallTrackerFactory::GetForBrowserContext(profile_); |