| Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
|
| index 62ebcdb0e5434e6db861a7151f119150ca53d971..ab3da1a62f688d38261d909fffff45c862e641ae 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
|
| @@ -426,11 +426,28 @@ bool KioskAppManager::GetApp(const std::string& app_id, App* app) const {
|
| if (!data)
|
| return false;
|
|
|
| - *app = App(*data, external_cache_->IsExtensionPending(app_id),
|
| - app_id == currently_auto_launched_with_zero_delay_app_);
|
| + if (app) {
|
| + *app = App(*data, external_cache_->IsExtensionPending(app_id),
|
| + app_id == currently_auto_launched_with_zero_delay_app_);
|
| + }
|
| return true;
|
| }
|
|
|
| +bool KioskAppManager::GetAppByAccountId(const AccountId& account_id,
|
| + App* app) const {
|
| + for (const auto& app_data : apps_) {
|
| + if (app_data->account_id() == account_id) {
|
| + if (app) {
|
| + const std::string& app_id = app_data->app_id();
|
| + *app = App(*app_data, external_cache_->IsExtensionPending(app_id),
|
| + app_id == currently_auto_launched_with_zero_delay_app_);
|
| + }
|
| + return true;
|
| + }
|
| + }
|
| + return false;
|
| +}
|
| +
|
| bool KioskAppManager::GetDisableBailoutShortcut() const {
|
| bool enable;
|
| if (CrosSettings::Get()->GetBoolean(
|
|
|