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

Side by Side Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

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: Addressed CR comments Created 5 years, 3 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync/glue/bookmark_model_associator.h"	5 #include "chrome/browser/sync/glue/bookmark_model_associator.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/containers/hash_tables.h"	9 #include "base/containers/hash_tables.h"

10 #include "base/format_macros.h"	10 #include "base/format_macros.h"

11 #include "base/location.h"	11 #include "base/location.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/metrics/field_trial.h"	13 #include "base/metrics/field_trial.h"

14 #include "base/single_thread_task_runner.h"	14 #include "base/single_thread_task_runner.h"

15 #include "base/strings/string_number_conversions.h"	15 #include "base/strings/string_number_conversions.h"

16 #include "base/strings/string_util.h"	16 #include "base/strings/string_util.h"

17 #include "base/strings/stringprintf.h"	17 #include "base/strings/stringprintf.h"

18 #include "base/strings/utf_string_conversions.h"	18 #include "base/strings/utf_string_conversions.h"

19 #include "base/thread_task_runner_handle.h"	19 #include "base/thread_task_runner_handle.h"

20 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/sync/glue/bookmark_change_processor.h"	21 #include "chrome/browser/sync/glue/bookmark_change_processor.h"

22 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	22 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

23 #include "components/bookmarks/browser/bookmark_client.h"	23 #include "components/bookmarks/browser/bookmark_client.h"

24 #include "components/bookmarks/browser/bookmark_model.h"	24 #include "components/bookmarks/browser/bookmark_model.h"

25 #include "components/undo/bookmark_undo_service.h"	25 #include "components/undo/bookmark_undo_service.h"

26 #include "components/undo/bookmark_undo_utils.h"	26 #include "components/undo/bookmark_undo_utils.h"

27 #include "content/public/browser/browser_thread.h"	27 #include "content/public/browser/browser_thread.h"

28 #include "sync/api/sync_error.h"	28 #include "sync/api/sync_error.h"

	29 #include "sync/api/sync_merge_result.h"

29 #include "sync/internal_api/public/delete_journal.h"	30 #include "sync/internal_api/public/delete_journal.h"

30 #include "sync/internal_api/public/read_node.h"	31 #include "sync/internal_api/public/read_node.h"

31 #include "sync/internal_api/public/read_transaction.h"	32 #include "sync/internal_api/public/read_transaction.h"

32 #include "sync/internal_api/public/write_node.h"	33 #include "sync/internal_api/public/write_node.h"

33 #include "sync/internal_api/public/write_transaction.h"	34 #include "sync/internal_api/public/write_transaction.h"

34 #include "sync/internal_api/syncapi_internal.h"	35 #include "sync/internal_api/syncapi_internal.h"

35 #include "sync/syncable/entry.h"	36 #include "sync/syncable/entry.h"

36 #include "sync/syncable/syncable_write_transaction.h"	37 #include "sync/syncable/syncable_write_transaction.h"

37 #include "sync/util/cryptographer.h"	38 #include "sync/util/cryptographer.h"

38 #include "sync/util/data_type_histogram.h"	39 #include "sync/util/data_type_histogram.h"

(...skipping 1150 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1189 syncer::BOOKMARKS);	1190 syncer::BOOKMARKS);

1190 } else {	1191 } else {

1191 context->set_native_model_sync_state(BEHIND);	1192 context->set_native_model_sync_state(BEHIND);

1192 }	1193 }

1193 }	1194 }

1194 }	1195 }

1195 return syncer::SyncError();	1196 return syncer::SyncError();

1196 }	1197 }

1197	1198

1198 } // namespace browser_sync	1199 } // namespace browser_sync

OLD	NEW