chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.cc

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

Patch Set: Rebased and fixed unit test fail 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/android/provider/chrome_browser_provider.cc

diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc

index 8944e93fb8add48c1866f76e4f2640874ef23a8b..df0a598db597f1b5cdd73c1816b2f533ed1233b9 100644

--- a/chrome/browser/android/provider/chrome_browser_provider.cc

+++ b/chrome/browser/android/provider/chrome_browser_provider.cc

@@ -30,6 +30,7 @@

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/history/top_sites.h"

+#include "chrome/browser/history/top_sites_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

@@ -1167,7 +1168,7 @@ ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj)

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

profile_ = g_browser_process->profile_manager()->GetLastUsedProfile();

bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_);

- top_sites_ = profile_->GetTopSites();

+ top_sites_ = TopSitesFactory::GetForProfile(profile_);

favicon_service_ = FaviconServiceFactory::GetForProfile(

profile_, ServiceAccessType::EXPLICIT_ACCESS),

service_.reset(new AndroidHistoryProviderService(profile_));