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

Side by Side Diff: chrome/browser/search/instant_service.h

Issue 557833006: Fix WeakPtrFactory member ordering in chrome/browser and chrome/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed the WeakPtr comments in files Created 6 years, 3 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/sessions/base_session_service.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SEARCH_INSTANT_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
6 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ 6 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 ObserverList<InstantServiceObserver> observers_; 156 ObserverList<InstantServiceObserver> observers_;
157 157
158 content::NotificationRegistrar registrar_; 158 content::NotificationRegistrar registrar_;
159 159
160 scoped_refptr<InstantIOContext> instant_io_context_; 160 scoped_refptr<InstantIOContext> instant_io_context_;
161 161
162 // Set to NULL if the default search provider does not support Instant. 162 // Set to NULL if the default search provider does not support Instant.
163 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_; 163 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_;
164 164
165 // Used for Top Sites async retrieval.
166 base::WeakPtrFactory<InstantService> weak_ptr_factory_;
167
168 // Used to check whether notifications from TemplateURLService indicate a 165 // Used to check whether notifications from TemplateURLService indicate a
169 // change that affects the default search provider. 166 // change that affects the default search provider.
170 scoped_ptr<TemplateURLData> previous_default_search_provider_; 167 scoped_ptr<TemplateURLData> previous_default_search_provider_;
171 GURL previous_google_base_url_; 168 GURL previous_google_base_url_;
172 169
170 // Used for Top Sites async retrieval.
171 base::WeakPtrFactory<InstantService> weak_ptr_factory_;
172
173 DISALLOW_COPY_AND_ASSIGN(InstantService); 173 DISALLOW_COPY_AND_ASSIGN(InstantService);
174 }; 174 };
175 175
176 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ 176 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sessions/base_session_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698