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

Unified Diff: chrome/browser/google/google_url_tracker.cc

Issue 122543002: Ensure WeakPtrFactories are at the end of their owning classes and refer (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google/google_url_tracker.h ('k') | chrome/browser/intranet_redirect_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_url_tracker.cc
===================================================================
--- chrome/browser/google/google_url_tracker.cc (revision 242728)
+++ chrome/browser/google/google_url_tracker.cc (working copy)
@@ -41,13 +41,13 @@
infobar_creator_(base::Bind(&GoogleURLTrackerInfoBarDelegate::Create)),
google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage :
profile->GetPrefs()->GetString(prefs::kLastKnownGoogleURL)),
- weak_ptr_factory_(this),
fetcher_id_(0),
in_startup_sleep_(true),
already_fetched_(false),
need_to_fetch_(false),
need_to_prompt_(false),
- search_committed_(false) {
+ search_committed_(false),
+ weak_ptr_factory_(this) {
net::NetworkChangeNotifier::AddIPAddressObserver(this);
nav_helper_->SetGoogleURLTracker(this);
@@ -202,8 +202,8 @@
void GoogleURLTracker::Shutdown() {
nav_helper_.reset();
+ fetcher_.reset();
weak_ptr_factory_.InvalidateWeakPtrs();
- fetcher_.reset();
net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
}
« no previous file with comments | « chrome/browser/google/google_url_tracker.h ('k') | chrome/browser/intranet_redirect_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698