chrome/browser/history/top_sites_impl.cc - Issue 815983002: Topsites become keyedService based.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/top_sites_impl.cc

Issue 815983002: Topsites become keyedService based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove extra inclusion from testing_profile.h Created 5 years, 11 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:

Index: chrome/browser/history/top_sites_impl.cc

diff --git a/chrome/browser/history/top_sites_impl.cc b/chrome/browser/history/top_sites_impl.cc

index 5d1a78d1ffce9c33f6fdbbeab34cc5e977e8e951..90af20a4a89561b181011c23c232c837c13c68d1 100644

--- a/chrome/browser/history/top_sites_impl.cc

+++ b/chrome/browser/history/top_sites_impl.cc

@@ -373,13 +373,15 @@ void TopSitesImpl::ClearBlacklistedURLs() {

NotifyTopSitesChanged();

}

-void TopSitesImpl::Shutdown() {

+void TopSitesImpl::ShutdownOnUIThread() {

profile_ = NULL;

// Cancel all requests so that the service doesn't callback to us after we've

// invoked Shutdown (this could happen if we have a pending request and

// Shutdown is invoked).

cancelable_task_tracker_.TryCancelAll();

- backend_->Shutdown();

+ registrar_.RemoveAll();

+ if (backend_)

+ backend_->Shutdown();

}

// static