components/sync_bookmarks/bookmark_change_processor.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

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: components/sync_bookmarks/bookmark_change_processor.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. Created 4 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

« build/all.gyp ('K') | « components/sync_bookmarks/bookmark_change_processor.h ('k') | components/sync_bookmarks/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_bookmarks/bookmark_change_processor.cc

diff --git a/components/sync_bookmarks/bookmark_change_processor.cc b/components/sync_bookmarks/bookmark_change_processor.cc

index 5577df492101f4dbbf0e676a27ca7a52d0c637b9..fdd9c6839fff5ae76dc2871031084d22f2dfbbfe 100644

--- a/components/sync_bookmarks/bookmark_change_processor.cc

+++ b/components/sync_bookmarks/bookmark_change_processor.cc

@@ -21,15 +21,15 @@

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

#include "components/favicon/core/favicon_service.h"

#include "components/history/core/browser/history_service.h"

+#include "components/sync/core/change_record.h"

+#include "components/sync/core/read_node.h"

+#include "components/sync/core/write_node.h"

+#include "components/sync/core/write_transaction.h"

+#include "components/sync/syncable/entry.h" // TODO(tim): Investigating bug 121587.

+#include "components/sync/syncable/syncable_write_transaction.h"

#include "components/sync_driver/sync_client.h"

#include "components/undo/bookmark_undo_service.h"

#include "components/undo/bookmark_undo_utils.h"

-#include "sync/internal_api/public/change_record.h"

-#include "sync/internal_api/public/read_node.h"

-#include "sync/internal_api/public/write_node.h"

-#include "sync/internal_api/public/write_transaction.h"

-#include "sync/syncable/entry.h" // TODO(tim): Investigating bug 121587.

-#include "sync/syncable/syncable_write_transaction.h"

#include "ui/gfx/favicon_size.h"

#include "ui/gfx/image/image_util.h"

« build/all.gyp ('K') | « components/sync_bookmarks/bookmark_change_processor.h ('k') | components/sync_bookmarks/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »