chrome/browser/sync/glue/bookmark_model_associator.h - Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes.

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_model_associator.h

Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing build on Android Created 5 years, 4 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: chrome/browser/sync/glue/bookmark_model_associator.h

diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h

index bcfc39b265f4fee2cbfeb23171cbba230058fa74..33d08c93001b68ed7696a5eb0b0217168aa6989a 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.h

+++ b/chrome/browser/sync/glue/bookmark_model_associator.h

@@ -9,12 +9,12 @@

#include <set>

#include <stack>

#include <string>

+#include <vector>

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/hash.h"

#include "base/memory/weak_ptr.h"

-#include "components/sync_driver/data_type_controller.h"

#include "components/sync_driver/data_type_error_handler.h"

#include "components/sync_driver/model_associator.h"

#include "sync/internal_api/public/util/unrecoverable_error_handler.h"

« no previous file with comments | « no previous file | chrome/browser/sync/glue/bookmark_model_associator.cc » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')