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

Unified Diff: components/dom_distiller/core/distiller.h

Issue 2712413002: Remove ScopedVector in //components/dom_distiller/ (Closed)
Patch Set: Remove ScopedVector in //components/dom_distiller/ Created 3 years, 10 months 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: components/dom_distiller/core/distiller.h
diff --git a/components/dom_distiller/core/distiller.h b/components/dom_distiller/core/distiller.h
index 9cd360ccfb39cfc19ce430dd5670876f124a8f4a..93ccaa4d4e7a1cd1a2d92c935e1507770ccb09fa 100644
--- a/components/dom_distiller/core/distiller.h
+++ b/components/dom_distiller/core/distiller.h
@@ -10,12 +10,12 @@
#include <map>
#include <memory>
#include <string>
+#include <vector>
#include "base/callback.h"
#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "components/dom_distiller/core/article_distillation_update.h"
#include "components/dom_distiller/core/distiller_page.h"
@@ -96,7 +96,7 @@ class DistillerImpl : public Distiller {
virtual ~DistilledPageData();
// Relative page number of the page.
int page_num;
- ScopedVector<DistillerURLFetcher> image_fetchers_;
+ std::vector<std::unique_ptr<DistillerURLFetcher>> image_fetchers_;
scoped_refptr<base::RefCountedData<DistilledPageProto> >
distilled_page_proto;
@@ -162,7 +162,7 @@ class DistillerImpl : public Distiller {
// Set of pages that are under distillation or have finished distillation.
// |started_pages_index_| and |finished_pages_index_| maintains the mapping
// from page number to the indices in |pages_|.
- ScopedVector<DistilledPageData> pages_;
+ std::vector<std::unique_ptr<DistilledPageData>> pages_;
// Maps page numbers of finished pages to the indices in |pages_|.
std::map<int, size_t> finished_pages_index_;

Powered by Google App Engine
This is Rietveld 408576698