Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1377)

Unified Diff: chrome/browser/importer/profile_writer.cc

Issue 10831061: 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/importer/importer_host.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/profile_writer.cc
===================================================================
--- chrome/browser/importer/profile_writer.cc (revision 148782)
+++ chrome/browser/importer/profile_writer.cc (working copy)
@@ -13,6 +13,7 @@
#include "base/threading/thread.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/history/history_service_factory.h"
#include "chrome/browser/password_manager/password_store.h"
#include "chrome/browser/password_manager/password_store_factory.h"
@@ -82,7 +83,7 @@
ProfileWriter::ProfileWriter(Profile* profile) : profile_(profile) {}
bool ProfileWriter::BookmarkModelIsLoaded() const {
- return profile_->GetBookmarkModel()->IsLoaded();
+ return BookmarkModelFactory::GetForProfile(profile_)->IsLoaded();
}
bool ProfileWriter::TemplateURLServiceIsLoaded() const {
@@ -123,7 +124,7 @@
if (bookmarks.empty())
return;
- BookmarkModel* model = profile_->GetBookmarkModel();
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
DCHECK(model->IsLoaded());
// If the bookmark bar is currently empty, we should import directly to it.
« no previous file with comments | « chrome/browser/importer/importer_host.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698