Chromium Code Reviews| Index: chrome/browser/profiles/profile_manager.cc |
| =================================================================== |
| --- chrome/browser/profiles/profile_manager.cc (revision 109887) |
| +++ chrome/browser/profiles/profile_manager.cc (working copy) |
| @@ -213,6 +213,9 @@ |
| ProfileManager::~ProfileManager() { |
| BrowserList::RemoveObserver(this); |
| +#if defined(OS_WIN) |
| + profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get()); |
|
Robert Sesek
2011/11/18 14:13:43
The ShortcutManager could add and remove itself as
grt (UTC plus 2)
2011/11/18 16:02:15
If you go that route, be sure to either explicitly
Miranda Callahan
2011/11/18 19:00:36
Hmm -- I didn't do this because both the PIC and t
Miranda Callahan
2011/11/18 19:00:36
Yup -- this came in after I had written the above
|
| +#endif |
| } |
| FilePath ProfileManager::GetDefaultProfileDir( |
| @@ -590,6 +593,10 @@ |
| if (!profile_info_cache_.get()) { |
| profile_info_cache_.reset(new ProfileInfoCache( |
| g_browser_process->local_state(), user_data_dir_)); |
| +#if defined(OS_WIN) |
| + profile_shortcut_manager_.reset(new ProfileShortcutManagerWin()); |
| + profile_info_cache_->AddObserver(profile_shortcut_manager_.get()); |
| +#endif |
| } |
| return *profile_info_cache_.get(); |
| } |