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

Side by Side Diff: chrome/browser/prerender/prerender_local_predictor.h

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history_; 226 scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history_;
227 227
228 scoped_ptr<PrerenderProperties> current_prerender_; 228 scoped_ptr<PrerenderProperties> current_prerender_;
229 scoped_ptr<PrerenderProperties> last_swapped_in_prerender_; 229 scoped_ptr<PrerenderProperties> last_swapped_in_prerender_;
230 230
231 ScopedVector<PrerenderProperties> issued_prerenders_; 231 ScopedVector<PrerenderProperties> issued_prerenders_;
232 232
233 base::hash_set<int64> url_whitelist_; 233 base::hash_set<int64> url_whitelist_;
234 234
235 base::WeakPtrFactory<PrerenderLocalPredictor> weak_factory_;
236
237 scoped_ptr<PrefetchList> prefetch_list_; 235 scoped_ptr<PrefetchList> prefetch_list_;
238 236
239 ScopedObserver<HistoryService, HistoryServiceObserver> 237 ScopedObserver<HistoryService, HistoryServiceObserver>
240 history_service_observer_; 238 history_service_observer_;
241 239
240 base::WeakPtrFactory<PrerenderLocalPredictor> weak_factory_;
241
242 DISALLOW_COPY_AND_ASSIGN(PrerenderLocalPredictor); 242 DISALLOW_COPY_AND_ASSIGN(PrerenderLocalPredictor);
243 }; 243 };
244 244
245 } // namespace prerender 245 } // namespace prerender
246 246
247 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_ 247 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/local_discovery/service_discovery_client_mdns.cc ('k') | chrome/browser/prerender/prerender_local_predictor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698