chrome/browser/sync/glue/bookmark_change_processor.cc - Issue 10825068: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

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/sync/glue/bookmark_change_processor.cc

Issue 10825068: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

Index: chrome/browser/sync/glue/bookmark_change_processor.cc

===================================================================

--- chrome/browser/sync/glue/bookmark_change_processor.cc (revision 149222)

+++ chrome/browser/sync/glue/bookmark_change_processor.cc (working copy)

@@ -12,6 +12,7 @@

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

+#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/favicon/favicon_service.h"

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

@@ -45,7 +46,7 @@

void BookmarkChangeProcessor::StartImpl(Profile* profile) {

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

DCHECK(!bookmark_model_);

- bookmark_model_ = profile->GetBookmarkModel();

+ bookmark_model_ = BookmarkModelFactory::GetForProfile(profile);

DCHECK(bookmark_model_->IsLoaded());

bookmark_model_->AddObserver(this);

}

« no previous file with comments | « no previous file | chrome/browser/sync/glue/bookmark_data_type_controller.cc » ('j') | no next file with comments »