chrome/browser/sync/glue/bookmark_data_type_controller.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_data_type_controller.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

« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

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

#include "base/metrics/histogram.h"

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

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

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

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

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

@@ -78,7 +79,8 @@

// Check that both the bookmark model and the history service (for favicons)

// are loaded.

bool BookmarkDataTypeController::DependentsLoaded() {

- BookmarkModel* bookmark_model = profile_->GetBookmarkModel();

+ BookmarkModel* bookmark_model =

+ BookmarkModelFactory::GetForProfile(profile_);

if (!bookmark_model || !bookmark_model->IsLoaded())

return false;