chrome/browser/bookmarks/chrome_bookmark_client.cc - Issue 1198963014: Change ownership of BookmarkClient

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/bookmarks/chrome_bookmark_client.cc

Issue 1198963014: Change ownership of BookmarkClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_managed_and_supervised_nodes

Patch Set: Rebase Created 5 years, 6 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

« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.h ('k') | chrome/browser/bookmarks/chrome_bookmark_client_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/bookmarks/chrome_bookmark_client.cc

diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc

index d08a72a3b242d8fe6da592b132bb119c73401e99..679681a84ad1ce689bd17e1379fb5a6dd7ad352f 100644

--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc

+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc

@@ -69,16 +69,16 @@ ChromeBookmarkClient::ChromeBookmarkClient(Profile* profile)

ChromeBookmarkClient::~ChromeBookmarkClient() {

}

-void ChromeBookmarkClient::Init(BookmarkModel* model) {

- DCHECK(model);

+void ChromeBookmarkClient::Init(BookmarkModel* bookmark_model) {

+ DCHECK(bookmark_model);

managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(

- model,

+ bookmark_model,

profile_->GetPrefs(),

false,

base::Bind(&ChromeBookmarkClient::GetManagedBookmarksDomain,

base::Unretained(this))));

supervised_bookmarks_tracker_.reset(new ManagedBookmarksTracker(

- model,

+ bookmark_model,

profile_->GetPrefs(),

true,

base::Callback<std::string()>()));

« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.h ('k') | chrome/browser/bookmarks/chrome_bookmark_client_factory.h » ('j') | no next file with comments »