Chromium Code Reviews| Index: chrome/browser/chromeos/login/wallpaper_manager.cc |
| diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc |
| index 12d945cd4d46460d85e9414bae02d08b63bb00d4..6df51df80be54a716b75514a5665056eebb03ee4 100644 |
| --- a/chrome/browser/chromeos/login/wallpaper_manager.cc |
| +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc |
| @@ -420,15 +420,7 @@ void WallpaperManager::PendingWallpaper::OnWallpaperSet() { |
| } |
| // Destroy self. |
| - DCHECK(manager->loading_.size() > 0); |
| - |
| - for (WallpaperManager::PendingList::iterator i = manager->loading_.begin(); |
| - i != manager->loading_.end(); |
| - ++i) |
| - if (i->get() == this) { |
| - manager->loading_.erase(i); |
| - break; |
| - } |
| + manager->RemovePendingWallpaperFromList(this); |
| } |
| // WallpaperManager, public: --------------------------------------------------- |
| @@ -1753,6 +1745,21 @@ WallpaperManager::PendingWallpaper* WallpaperManager::GetPendingWallpaper( |
| return pending_inactive_; |
| } |
| +void WallpaperManager::RemovePendingWallpaperFromList( |
| + PendingWallpaper* pending) { |
| + DCHECK(loading_.size() > 0); |
| + for (WallpaperManager::PendingList::iterator i = loading_.begin(); |
| + i != loading_.end(); |
| + ++i) |
|
Daniel Erat
2014/04/30 00:24:22
you need curly brackets here
Alexander Alekseev
2014/04/30 01:10:22
Done.
|
| + if (i->get() == pending) { |
| + loading_.erase(i); |
| + break; |
| + } |
| + |
| + if (loading_.size() == 0) |
|
Daniel Erat
2014/04/30 00:24:22
nit: if (loading_.empty())
Alexander Alekseev
2014/04/30 01:10:22
Done.
|
| + FOR_EACH_OBSERVER(Observer, observers_, OnPendingListEmptyForTesting()); |
| +} |
| + |
| void WallpaperManager::SetCustomizedDefaultWallpaper( |
| const GURL& wallpaper_url, |
| const base::FilePath& downloaded_file, |