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

diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.cc b/chrome/browser/android/dev_tools_manager_delegate_android.cc

index a5da5f74ec51df9259b4fd8bc5d11238fc6543ce..6a171406325a0df8e8643f859d680fb64cbeff92 100644

--- a/chrome/browser/android/dev_tools_manager_delegate_android.cc

+++ b/chrome/browser/android/dev_tools_manager_delegate_android.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/android/tab_android.h"

#include "chrome/browser/browser_process.h"

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

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

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

#include "chrome/browser/ui/android/tab_model/tab_model.h"

#include "chrome/browser/ui/android/tab_model/tab_model_list.h"

@@ -337,7 +338,8 @@ void DevToolsManagerDelegateAndroid::EnumerateTargets(TargetCallback callback) {

std::string DevToolsManagerDelegateAndroid::GetPageThumbnailData(

const GURL& url) {

Profile* profile = ProfileManager::GetLastUsedProfile()->GetOriginalProfile();

- history::TopSites* top_sites = profile->GetTopSites();

+ scoped_refptr<history::TopSites> top_sites =

+ TopSitesFactory::GetForProfile(profile);

if (top_sites) {

scoped_refptr<base::RefCountedMemory> data;

if (top_sites->GetPageThumbnail(url, false, &data))