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

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 1745f7127ee3d5f88df2fbd04f1e5404886d4166..fb8035e4e3a747b3dcb0311a25e774c02e4778c2 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -58,6 +58,7 @@

#include "chrome/browser/file_select_helper.h"

#include "chrome/browser/first_run/first_run.h"

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

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

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

@@ -1884,7 +1885,8 @@ OmniboxView* Browser::GetOmniboxView() {

}

std::set<std::string> Browser::GetOpenUrls() {

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

+ scoped_refptr<history::TopSites> top_sites =

+ TopSitesFactory::GetForProfile(profile_);

if (!top_sites) // NULL for Incognito profiles.

return std::set<std::string>();