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

Unified Diff: chrome/browser/sync/glue/bookmark_change_processor.h

Issue 12891006: bookmarks: Remove Profile getter accessor from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cocoa alignments Created 7 years, 9 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/bookmark_model.h ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/bookmark_change_processor.h
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h
index 0093789b9fc2d9a811daeb56cfc342379161d86c..b8d06f1d5007fc8263c9a27b49fc551e97e21107 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.h
+++ b/chrome/browser/sync/glue/bookmark_change_processor.h
@@ -73,6 +73,7 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
static const BookmarkNode* CreateOrUpdateBookmarkNode(
syncer::BaseNode* src,
BookmarkModel* model,
+ Profile* profile,
BookmarkModelAssociator* model_associator);
// The following methods are static and hence may be invoked at any time,
@@ -83,6 +84,7 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
syncer::BaseNode* sync_node,
const BookmarkNode* parent,
BookmarkModel* model,
+ Profile* profile,
int index);
// Sets the favicon of the given bookmark node from the given sync node.
@@ -91,7 +93,8 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
// for the bookmark in question.
static bool SetBookmarkFavicon(syncer::BaseNode* sync_node,
const BookmarkNode* bookmark_node,
- BookmarkModel* model);
+ BookmarkModel* model,
+ Profile* profile);
// Applies the 1x favicon |bitmap_data| and |icon_url| to |bookmark_node|.
// |profile| is the profile that contains the HistoryService and BookmarkModel
@@ -182,6 +185,8 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
// |running_| is true.
BookmarkModel* bookmark_model_;
+ Profile* profile_;
+
// The two models should be associated according to this ModelAssociator.
BookmarkModelAssociator* model_associator_;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698