Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h

Issue 1433013004: Replace ScopedVector with vector<scoped_ptr> in BitmapFetcherService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedvector-bitmapfetcher: no-find-fix-unittest Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
index cc3ecba422699bfe1c510fbbf105a5a30ca4086b..a6bf8ba622107f7b7f5522bea1176c5320ba8700 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
@@ -63,13 +63,11 @@ class BitmapFetcherService : public KeyedService,
protected:
// Create a bitmap fetcher for the given |url| and start it. Virtual method
// so tests can override this for different behavior.
- virtual chrome::BitmapFetcher* CreateFetcher(const GURL& url);
+ virtual scoped_ptr<chrome::BitmapFetcher> CreateFetcher(const GURL& url);
private:
friend class BitmapFetcherServiceTest;
- typedef ScopedVector<chrome::BitmapFetcher> BitmapFetchers;
-
// Gets the existing fetcher for |url| or constructs a new one if it doesn't
// exist.
const chrome::BitmapFetcher* EnsureFetcherForUrl(const GURL& url);
@@ -85,7 +83,7 @@ class BitmapFetcherService : public KeyedService,
void OnFetchComplete(const GURL& url, const SkBitmap* bitmap) override;
// Currently active image fetchers.
- BitmapFetchers active_fetchers_;
+ std::vector<scoped_ptr<chrome::BitmapFetcher>> active_fetchers_;
// Currently active requests.
ScopedVector<BitmapFetcherRequest> requests_;

Powered by Google App Engine
This is Rietveld 408576698