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

Unified Diff: components/sync_bookmarks/bookmark_change_processor.h

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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: components/sync_bookmarks/bookmark_change_processor.h
diff --git a/components/sync_bookmarks/bookmark_change_processor.h b/components/sync_bookmarks/bookmark_change_processor.h
index d0a015f443e3ca17cea5e718819e0903c2ec4035..df214019d201ffcfbfa43edb58bf5b98d3d19765 100644
--- a/components/sync_bookmarks/bookmark_change_processor.h
+++ b/components/sync_bookmarks/bookmark_change_processor.h
@@ -24,17 +24,14 @@ class Profile;
namespace base {
class RefCountedMemory;
-}
+} // namespace base
namespace syncer {
+class SyncClient;
class WriteNode;
class WriteTransaction;
} // namespace syncer
-namespace sync_driver {
-class SyncClient;
-}
-
namespace sync_bookmarks {
// This class is responsible for taking changes from the BookmarkModel
@@ -42,10 +39,10 @@ namespace sync_bookmarks {
// All operations and use of this class are from the UI thread.
// This is currently bookmarks specific.
class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
- public sync_driver::ChangeProcessor {
+ public syncer::ChangeProcessor {
public:
BookmarkChangeProcessor(
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
BookmarkModelAssociator* model_associator,
std::unique_ptr<syncer::DataTypeErrorHandler> error_handler);
~BookmarkChangeProcessor() override;
@@ -100,7 +97,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
static void UpdateBookmarkWithSyncData(const syncer::BaseNode& sync_node,
bookmarks::BookmarkModel* model,
const bookmarks::BookmarkNode* node,
- sync_driver::SyncClient* sync_client);
+ syncer::SyncClient* sync_client);
// Creates a bookmark node under the given parent node from the given sync
// node. Returns the newly created node. The created node is placed at the
@@ -109,7 +106,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
const syncer::BaseNode* sync_node,
const bookmarks::BookmarkNode* parent,
bookmarks::BookmarkModel* model,
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
int index);
// Overload of CreateBookmarkNode function above that helps to avoid
@@ -120,7 +117,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
const syncer::BaseNode* sync_node,
const bookmarks::BookmarkNode* parent,
bookmarks::BookmarkModel* model,
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
int index);
// Sets the favicon of the given bookmark node from the given sync node.
@@ -130,14 +127,14 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
static bool SetBookmarkFavicon(const syncer::BaseNode* sync_node,
const bookmarks::BookmarkNode* bookmark_node,
bookmarks::BookmarkModel* model,
- sync_driver::SyncClient* sync_client);
+ syncer::SyncClient* sync_client);
// Applies the 1x favicon |bitmap_data| and |icon_url| to |bookmark_node|.
// |profile| is the profile that contains the HistoryService and BookmarkModel
// for the bookmark in question.
static void ApplyBookmarkFavicon(
const bookmarks::BookmarkNode* bookmark_node,
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
const GURL& icon_url,
const scoped_refptr<base::RefCountedMemory>& bitmap_data);
@@ -250,7 +247,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
// |running_| is true.
bookmarks::BookmarkModel* bookmark_model_;
- sync_driver::SyncClient* sync_client_;
+ syncer::SyncClient* sync_client_;
// The two models should be associated according to this ModelAssociator.
BookmarkModelAssociator* model_associator_;
« no previous file with comments | « components/sync/tools/sync_listen_notifications.cc ('k') | components/sync_bookmarks/bookmark_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698