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

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

Issue 658943002: Revert of [src/chrome/browser/] Declaring the weak_ptr_factory in proper order in ui and prerender … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_local_predictor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history_; 229 scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history_;
230 230
231 scoped_ptr<PrerenderProperties> current_prerender_; 231 scoped_ptr<PrerenderProperties> current_prerender_;
232 scoped_ptr<PrerenderProperties> last_swapped_in_prerender_; 232 scoped_ptr<PrerenderProperties> last_swapped_in_prerender_;
233 233
234 ScopedVector<PrerenderProperties> issued_prerenders_; 234 ScopedVector<PrerenderProperties> issued_prerenders_;
235 235
236 base::hash_set<int64> url_whitelist_; 236 base::hash_set<int64> url_whitelist_;
237 237
238 base::WeakPtrFactory<PrerenderLocalPredictor> weak_factory_;
239
238 scoped_ptr<PrefetchList> prefetch_list_; 240 scoped_ptr<PrefetchList> prefetch_list_;
239 241
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 | « no previous file | chrome/browser/prerender/prerender_local_predictor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698