summaryrefslogtreecommitdiffstats
path: root/chrome/browser/apps/shortcut_manager.cc
diff options
context:
space:
mode:
authorlwchkg <lwchkg@gmail.com>2016-03-12 22:29:54 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-13 06:30:58 +0000
commit9c18394adda7145297537795714906a3354e1529 (patch)
tree0f2683eb8a274bd55b8e0cc4ae2676e0402e47c2 /chrome/browser/apps/shortcut_manager.cc
parent202db51d82dbbade9baa3e69a9062e73a18b22e7 (diff)
downloadchromium_src-9c18394adda7145297537795714906a3354e1529.zip
chromium_src-9c18394adda7145297537795714906a3354e1529.tar.gz
chromium_src-9c18394adda7145297537795714906a3354e1529.tar.bz2
Refactor ProfileInfoCache in most of chrome/browser
ProfileInfoCache is being refactored into ProfileAttributesStorage and ProfileAttributesEntry, which use profile paths instead of numerical indices in the interface. See https://crrev.com/94dacdb8289038b7fa68c9f2bd57d5311b2cb5cb for details. This CL does not include files in chrome/browser/profiles BUG=305720 Review URL: https://codereview.chromium.org/1768813002 Cr-Commit-Position: refs/heads/master@{#380892}
Diffstat (limited to 'chrome/browser/apps/shortcut_manager.cc')
-rw-r--r--chrome/browser/apps/shortcut_manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc
index bb4e1ca..91f2330 100644
--- a/chrome/browser/apps/shortcut_manager.cc
+++ b/chrome/browser/apps/shortcut_manager.cc
@@ -70,7 +70,7 @@ void AppShortcutManager::RegisterProfilePrefs(
AppShortcutManager::AppShortcutManager(Profile* profile)
: profile_(profile),
- is_profile_info_cache_observer_(false),
+ is_profile_attributes_storage_observer_(false),
prefs_(profile->GetPrefs()),
extension_registry_observer_(this),
weak_ptr_factory_(this) {
@@ -93,12 +93,12 @@ AppShortcutManager::AppShortcutManager(Profile* profile)
// profile_manager might be NULL in testing environments.
if (profile_manager) {
profile_manager->GetProfileAttributesStorage().AddObserver(this);
- is_profile_info_cache_observer_ = true;
+ is_profile_attributes_storage_observer_ = true;
}
}
AppShortcutManager::~AppShortcutManager() {
- if (g_browser_process && is_profile_info_cache_observer_) {
+ if (g_browser_process && is_profile_attributes_storage_observer_) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
// profile_manager might be NULL in testing environments or during shutdown.
if (profile_manager)