| Index: chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
|
| diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
|
| index b86400a65d6f48420e2ca720407d9504d8bd7cda..e3368fe53fb5c9094cb78268097c82624b4904f2 100644
|
| --- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
|
| +++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
|
| @@ -591,19 +591,41 @@ void ArcAppListPrefs::RemoveAllApps() {
|
| }
|
|
|
| void ArcAppListPrefs::OnOptInEnabled(bool enabled) {
|
| + UpdateDefaultAppsHiddenState();
|
| +
|
| if (enabled)
|
| NotifyRegisteredApps();
|
| else
|
| RemoveAllApps();
|
| }
|
|
|
| +void ArcAppListPrefs::UpdateDefaultAppsHiddenState() {
|
| + const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
|
| + const bool was_hidden = default_apps_.is_hidden();
|
| + default_apps_.set_hidden(!auth_service->IsArcEnabled() &&
|
| + auth_service->IsArcManaged());
|
| + if (was_hidden && !default_apps_.is_hidden())
|
| + RegisterDefaultApps();
|
| +}
|
| +
|
| void ArcAppListPrefs::OnDefaultAppsReady() {
|
| // Apply uninstalled packages now.
|
| +
|
| const std::vector<std::string> uninstalled_package_names =
|
| GetPackagesFromPrefs(false);
|
| for (const auto& uninstalled_package_name : uninstalled_package_names)
|
| default_apps_.MaybeMarkPackageUninstalled(uninstalled_package_name, true);
|
|
|
| + UpdateDefaultAppsHiddenState();
|
| +
|
| + default_apps_ready_ = true;
|
| + if (!default_apps_ready_callback_.is_null())
|
| + default_apps_ready_callback_.Run();
|
| +
|
| + StartPrefs();
|
| +}
|
| +
|
| +void ArcAppListPrefs::RegisterDefaultApps() {
|
| // Report default apps first, note, app_map includes uninstalled apps as well.
|
| for (const auto& default_app : default_apps_.app_map()) {
|
| const std::string& app_id = default_app.first;
|
| @@ -622,12 +644,6 @@ void ArcAppListPrefs::OnDefaultAppsReady() {
|
| true /* launchable */,
|
| arc::mojom::OrientationLock::NONE);
|
| }
|
| -
|
| - default_apps_ready_ = true;
|
| - if (!default_apps_ready_callback_.is_null())
|
| - default_apps_ready_callback_.Run();
|
| -
|
| - StartPrefs();
|
| }
|
|
|
| void ArcAppListPrefs::SetDefaltAppsReadyCallback(base::Closure callback) {
|
|
|