chrome/browser/importer/profile_writer.cc - Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere

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/importer/profile_writer.cc

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks

Patch Set: Eliminate Profile::FromBrowserContext in some places Created 4 years, 4 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/history/android/android_history_provider_service_unittest.cc ('K') | « chrome/browser/importer/external_process_importer_host.cc ('k') | chrome/browser/importer/profile_writer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/importer/profile_writer.cc

diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc

index 9e817ecb6794683ade303f2a038c79ed5b6e773a..642bbf31567c2c7bcaf189d08041fd459c3a7396 100644

--- a/chrome/browser/importer/profile_writer.cc

+++ b/chrome/browser/importer/profile_writer.cc

@@ -84,7 +84,7 @@ void ShowBookmarkBar(Profile* profile) {

ProfileWriter::ProfileWriter(Profile* profile) : profile_(profile) {}

bool ProfileWriter::BookmarkModelIsLoaded() const {

- return BookmarkModelFactory::GetForProfile(profile_)->loaded();

+ return BookmarkModelFactory::GetForBrowserContext(profile_)->loaded();

}

bool ProfileWriter::TemplateURLServiceIsLoaded() const {

@@ -127,7 +127,7 @@ void ProfileWriter::AddBookmarks(

if (bookmarks.empty())

return;

- BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);

+ BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);

DCHECK(model->loaded());

// If the bookmark bar is currently empty, we should import directly to it.