Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/profiles/profile_info_cache.h" | 5 #include "chrome/browser/profiles/profile_info_cache.h" |
| 6 | 6 |
| 7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
| 11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
| 12 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "base/values.h" | 14 #include "base/values.h" |
| 15 #include "chrome/browser/browser_process.h" | |
| 15 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
| 16 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 17 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 17 #include "chrome/common/chrome_notification_types.h" | 18 #include "chrome/common/chrome_notification_types.h" |
| 18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 19 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
| 20 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 21 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 22 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 23 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
| 24 | 25 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 IDS_DEFAULT_AVATAR_NAME_18, | 80 IDS_DEFAULT_AVATAR_NAME_18, |
| 80 IDS_DEFAULT_AVATAR_NAME_19, | 81 IDS_DEFAULT_AVATAR_NAME_19, |
| 81 IDS_DEFAULT_AVATAR_NAME_20, | 82 IDS_DEFAULT_AVATAR_NAME_20, |
| 82 IDS_DEFAULT_AVATAR_NAME_21, | 83 IDS_DEFAULT_AVATAR_NAME_21, |
| 83 IDS_DEFAULT_AVATAR_NAME_22, | 84 IDS_DEFAULT_AVATAR_NAME_22, |
| 84 IDS_DEFAULT_AVATAR_NAME_23, | 85 IDS_DEFAULT_AVATAR_NAME_23, |
| 85 IDS_DEFAULT_AVATAR_NAME_24, | 86 IDS_DEFAULT_AVATAR_NAME_24, |
| 86 IDS_DEFAULT_AVATAR_NAME_25 | 87 IDS_DEFAULT_AVATAR_NAME_25 |
| 87 }; | 88 }; |
| 88 | 89 |
| 89 } // namespace | 90 } // namespace |
| 90 | 91 |
| 91 ProfileInfoCache::ProfileInfoCache(PrefService* prefs, | 92 ProfileInfoCache::ProfileInfoCache(PrefService* prefs, |
| 92 const FilePath& user_data_dir) | 93 const FilePath& user_data_dir) |
| 93 : prefs_(prefs), | 94 : prefs_(prefs), |
| 94 user_data_dir_(user_data_dir) { | 95 user_data_dir_(user_data_dir) { |
| 95 // Populate the cache | 96 // Populate the cache |
| 96 const DictionaryValue* cache = | 97 const DictionaryValue* cache = |
| 97 prefs_->GetDictionary(prefs::kProfileInfoCache); | 98 prefs_->GetDictionary(prefs::kProfileInfoCache); |
| 98 for (DictionaryValue::key_iterator it = cache->begin_keys(); | 99 for (DictionaryValue::key_iterator it = cache->begin_keys(); |
| 99 it != cache->end_keys(); ++it) { | 100 it != cache->end_keys(); ++it) { |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 120 scoped_ptr<DictionaryValue> info(new DictionaryValue); | 121 scoped_ptr<DictionaryValue> info(new DictionaryValue); |
| 121 info->SetString(kNameKey, name); | 122 info->SetString(kNameKey, name); |
| 122 info->SetString(kUserNameKey, username); | 123 info->SetString(kUserNameKey, username); |
| 123 info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index)); | 124 info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index)); |
| 124 // Default value for whether background apps are running is false. | 125 // Default value for whether background apps are running is false. |
| 125 info->SetBoolean(kBackgroundAppsKey, false); | 126 info->SetBoolean(kBackgroundAppsKey, false); |
| 126 cache->Set(key, info.release()); | 127 cache->Set(key, info.release()); |
| 127 | 128 |
| 128 sorted_keys_.insert(FindPositionForProfile(key, name), key); | 129 sorted_keys_.insert(FindPositionForProfile(key, name), key); |
| 129 | 130 |
| 131 FOR_EACH_OBSERVER(ProfileInfoCacheObserver, | |
| 132 observer_list_, | |
| 133 OnProfileAdded(name, UTF8ToUTF16(key))); | |
| 134 | |
| 130 content::NotificationService::current()->Notify( | 135 content::NotificationService::current()->Notify( |
| 131 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, | 136 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, |
| 132 content::NotificationService::AllSources(), | 137 content::NotificationService::AllSources(), |
| 133 content::NotificationService::NoDetails()); | 138 content::NotificationService::NoDetails()); |
| 134 } | 139 } |
| 135 | 140 |
| 141 void ProfileInfoCache::AddObserver(ProfileInfoCacheObserver* obs) { | |
| 142 observer_list_.AddObserver(obs); | |
| 143 } | |
| 144 | |
| 145 void ProfileInfoCache::RemoveObserver(ProfileInfoCacheObserver* obs) { | |
| 146 observer_list_.RemoveObserver(obs); | |
| 147 } | |
| 148 | |
| 136 void ProfileInfoCache::DeleteProfileFromCache(const FilePath& profile_path) { | 149 void ProfileInfoCache::DeleteProfileFromCache(const FilePath& profile_path) { |
| 137 DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache); | 150 DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache); |
| 138 DictionaryValue* cache = update.Get(); | 151 DictionaryValue* cache = update.Get(); |
| 152 std::string key = CacheKeyFromProfilePath(profile_path); | |
| 153 DictionaryValue* info = NULL; | |
| 154 cache->GetDictionary(key, &info); | |
| 155 string16 name; | |
| 156 info->GetString(kNameKey, &name); | |
| 139 | 157 |
| 140 std::string key = CacheKeyFromProfilePath(profile_path); | 158 FOR_EACH_OBSERVER(ProfileInfoCacheObserver, |
| 159 observer_list_, | |
| 160 OnProfileRemoved(name)); | |
| 161 | |
| 141 cache->Remove(key, NULL); | 162 cache->Remove(key, NULL); |
| 142 sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key)); | 163 sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key)); |
| 143 | 164 |
| 144 content::NotificationService::current()->Notify( | 165 content::NotificationService::current()->Notify( |
| 145 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, | 166 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, |
| 146 content::NotificationService::AllSources(), | 167 content::NotificationService::AllSources(), |
| 147 content::NotificationService::NoDetails()); | 168 content::NotificationService::NoDetails()); |
| 148 } | 169 } |
| 149 | 170 |
| 150 size_t ProfileInfoCache::GetNumberOfProfiles() const { | 171 size_t ProfileInfoCache::GetNumberOfProfiles() const { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 if (IsDefaultAvatarIconUrl(icon_url, &icon_index)) | 229 if (IsDefaultAvatarIconUrl(icon_url, &icon_index)) |
| 209 return icon_index; | 230 return icon_index; |
| 210 | 231 |
| 211 DLOG(WARNING) << "Unknown avatar icon: " << icon_url; | 232 DLOG(WARNING) << "Unknown avatar icon: " << icon_url; |
| 212 return GetDefaultAvatarIconResourceIDAtIndex(0); | 233 return GetDefaultAvatarIconResourceIDAtIndex(0); |
| 213 } | 234 } |
| 214 | 235 |
| 215 void ProfileInfoCache::SetNameOfProfileAtIndex(size_t index, | 236 void ProfileInfoCache::SetNameOfProfileAtIndex(size_t index, |
| 216 const string16& name) { | 237 const string16& name) { |
| 217 scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy()); | 238 scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy()); |
| 239 string16 old_name; | |
| 240 info->GetString(kNameKey, &old_name); | |
| 218 info->SetString(kNameKey, name); | 241 info->SetString(kNameKey, name); |
| 219 // This takes ownership of |info|. | 242 // This takes ownership of |info|. |
| 220 SetInfoForProfileAtIndex(index, info.release()); | 243 SetInfoForProfileAtIndex(index, info.release()); |
| 221 | 244 |
| 222 // Remove and reinsert key in |sorted_keys_| to alphasort. | 245 // Remove and reinsert key in |sorted_keys_| to alphasort. |
| 223 std::string key = CacheKeyFromProfilePath(GetPathOfProfileAtIndex(index)); | 246 std::string key = CacheKeyFromProfilePath(GetPathOfProfileAtIndex(index)); |
| 224 std::vector<std::string>::iterator key_it = | 247 std::vector<std::string>::iterator key_it = |
| 225 std::find(sorted_keys_.begin(), sorted_keys_.end(), key); | 248 std::find(sorted_keys_.begin(), sorted_keys_.end(), key); |
| 226 DCHECK(key_it != sorted_keys_.end()); | 249 DCHECK(key_it != sorted_keys_.end()); |
| 227 sorted_keys_.erase(key_it); | 250 sorted_keys_.erase(key_it); |
| 228 sorted_keys_.insert(FindPositionForProfile(key, name), key); | 251 sorted_keys_.insert(FindPositionForProfile(key, name), key); |
| 229 | 252 |
| 253 FOR_EACH_OBSERVER(ProfileInfoCacheObserver, | |
| 254 observer_list_, | |
| 255 OnProfileNameChanged(old_name, name)); | |
| 256 | |
| 230 content::NotificationService::current()->Notify( | 257 content::NotificationService::current()->Notify( |
| 231 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, | 258 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, |
| 232 content::NotificationService::AllSources(), | 259 content::NotificationService::AllSources(), |
| 233 content::NotificationService::NoDetails()); | 260 content::NotificationService::NoDetails()); |
| 234 } | 261 } |
| 235 | 262 |
| 236 void ProfileInfoCache::SetUserNameOfProfileAtIndex(size_t index, | 263 void ProfileInfoCache::SetUserNameOfProfileAtIndex(size_t index, |
| 237 const string16& user_name) { | 264 const string16& user_name) { |
| 238 string16 old_user_name; | 265 string16 old_user_name; |
| 239 const base::DictionaryValue* old_info = GetInfoForProfileAtIndex(index); | 266 const base::DictionaryValue* old_info = GetInfoForProfileAtIndex(index); |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 416 return sorted_keys_.begin() + i; | 443 return sorted_keys_.begin() + i; |
| 417 if (name_compare == 0) { | 444 if (name_compare == 0) { |
| 418 int key_compare = search_key.compare(sorted_keys_[i]); | 445 int key_compare = search_key.compare(sorted_keys_[i]); |
| 419 if (key_compare < 0) | 446 if (key_compare < 0) |
| 420 return sorted_keys_.begin() + i; | 447 return sorted_keys_.begin() + i; |
| 421 } | 448 } |
| 422 } | 449 } |
| 423 return sorted_keys_.end(); | 450 return sorted_keys_.end(); |
| 424 } | 451 } |
| 425 | 452 |
| 453 // static | |
| 454 std::vector<string16> ProfileInfoCache::GetProfileNames() { | |
| 455 std::vector<string16> names; | |
| 456 PrefService* local_state = g_browser_process->local_state(); | |
| 457 const DictionaryValue* cache = local_state->GetDictionary( | |
| 458 prefs::kProfileInfoCache); | |
| 459 for (base::DictionaryValue::key_iterator it = cache->begin_keys(); | |
| 460 it != cache->end_keys(); | |
|
Robert Sesek
2011/11/18 14:13:43
nit: align with b in base
Miranda Callahan
2011/11/18 19:00:36
Done.
| |
| 461 ++it) { | |
| 462 base::DictionaryValue* info = NULL; | |
| 463 cache->GetDictionary(*it, &info); | |
| 464 string16 name; | |
|
grt (UTC plus 2)
2011/11/18 16:02:15
nit: move this out of the loop so it isn't constru
Miranda Callahan
2011/11/18 19:00:36
Done.
| |
| 465 info->GetString(kNameKey, &name); | |
| 466 names.push_back(name); | |
| 467 } | |
| 468 return names; | |
| 469 } | |
| 470 | |
| 471 // static | |
| 426 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) { | 472 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) { |
| 427 prefs->RegisterDictionaryPref(prefs::kProfileInfoCache); | 473 prefs->RegisterDictionaryPref(prefs::kProfileInfoCache); |
| 428 } | 474 } |
| OLD | NEW |