| Index: chrome/browser/ui/app_list/app_list_service_mac.mm
|
| diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| index 83f96f61758080d6e886765147cba6c09ae76fdc..8da7b95e0bd245e7b11f4ec09619c72145aae06e 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| @@ -19,7 +19,8 @@
|
| #import "chrome/browser/app_controller_mac.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/profiles/profile_info_cache.h"
|
| +#include "chrome/browser/profiles/profile_attributes_entry.h"
|
| +#include "chrome/browser/profiles/profile_attributes_storage.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/app_list/app_list_positioner.h"
|
| #include "chrome/browser/ui/app_list/app_list_service.h"
|
| @@ -388,13 +389,11 @@ void AppListServiceMac::InitWithProfilePath(
|
| // Do not show the launcher window when the profile is locked, or if it
|
| // can't be displayed unpopulated. In the latter case, the Show will occur
|
| // in OnShimLaunch() or AppListService::HandleLaunchCommandLine().
|
| - const ProfileInfoCache& profile_info_cache =
|
| - g_browser_process->profile_manager()->GetProfileInfoCache();
|
| - size_t profile_index = profile_info_cache.
|
| - GetIndexOfProfileWithPath(profile_path);
|
| - if (profile_index != std::string::npos &&
|
| - !profile_info_cache.ProfileIsSigninRequiredAtIndex(profile_index) &&
|
| - ReadyToShow())
|
| + ProfileAttributesEntry* entry = nullptr;
|
| + bool has_entry = g_browser_process->profile_manager()->
|
| + GetProfileAttributesStorage().
|
| + GetProfileAttributesWithPath(profile_path, &entry);
|
| + if (has_entry && !entry->IsSigninRequired() && ReadyToShow())
|
| ShowWindowNearDock();
|
| }
|
| }
|
|
|