chrome/browser/ui/app_list/app_list_service_mac.mm - Issue 1631373003: Refactor ProfileInfoCache in c/b/ui/app_list

Unified Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

Issue 1631373003: Refactor ProfileInfoCache in c/b/ui/app_list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to comments, add sorting of ProfileAttributesEntry Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 03a81b15c4c50f5654cb407553db5ef90312ed67..68bc3b8dcae085698527d408fd1b3eb0708df336 100644

--- a/chrome/browser/ui/app_list/app_list_service_mac.mm

+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm

@@ -20,7 +20,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())

tapted 2016/01/31 23:04:37 drive-by: I think you're missing a `!` before entr

lwchkg 2016/02/01 06:31:20 Thanks for spotting! I don't have a Mac myself, so

tapted 2016/02/02 00:20:55 Not sure - this path is used to improve response t

ShowWindowNearDock();

}