sync/internal_api/sync_manager.cc - Issue 10690071: [Sync] Move model_type* from syncable/ to base/

Side by Side Diff: sync/internal_api/sync_manager.cc

Issue 10690071: [Sync] Move model_type* from syncable/ to base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « sync/internal_api/public/write_node.h ('k') | sync/internal_api/syncapi_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "sync/internal_api/public/sync_manager.h"	5 #include "sync/internal_api/public/sync_manager.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/base64.h"	9 #include "base/base64.h"

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

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

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

13 #include "base/compiler_specific.h"	13 #include "base/compiler_specific.h"

14 #include "base/json/json_writer.h"	14 #include "base/json/json_writer.h"

15 #include "base/memory/ref_counted.h"	15 #include "base/memory/ref_counted.h"

16 #include "base/metrics/histogram.h"	16 #include "base/metrics/histogram.h"

17 #include "base/observer_list.h"	17 #include "base/observer_list.h"

18 #include "base/string_number_conversions.h"	18 #include "base/string_number_conversions.h"

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

20 #include "net/base/network_change_notifier.h"	20 #include "net/base/network_change_notifier.h"

21 #include "sync/engine/all_status.h"	21 #include "sync/engine/all_status.h"

22 #include "sync/engine/net/server_connection_manager.h"	22 #include "sync/engine/net/server_connection_manager.h"

23 #include "sync/engine/sync_scheduler.h"	23 #include "sync/engine/sync_scheduler.h"

24 #include "sync/engine/syncer_types.h"	24 #include "sync/engine/syncer_types.h"

25 #include "sync/engine/throttled_data_type_tracker.h"	25 #include "sync/engine/throttled_data_type_tracker.h"

26 #include "sync/internal_api/change_reorder_buffer.h"	26 #include "sync/internal_api/change_reorder_buffer.h"

27 #include "sync/internal_api/debug_info_event_listener.h"	27 #include "sync/internal_api/debug_info_event_listener.h"

28 #include "sync/internal_api/js_mutation_event_observer.h"	28 #include "sync/internal_api/js_mutation_event_observer.h"

29 #include "sync/internal_api/js_sync_manager_observer.h"	29 #include "sync/internal_api/js_sync_manager_observer.h"

	30 #include "sync/internal_api/public/base/model_type.h"

	31 #include "sync/internal_api/public/base/model_type_payload_map.h"

30 #include "sync/internal_api/public/base_node.h"	32 #include "sync/internal_api/public/base_node.h"

31 #include "sync/internal_api/public/configure_reason.h"	33 #include "sync/internal_api/public/configure_reason.h"

32 #include "sync/internal_api/public/engine/polling_constants.h"	34 #include "sync/internal_api/public/engine/polling_constants.h"

33 #include "sync/internal_api/public/read_node.h"	35 #include "sync/internal_api/public/read_node.h"

34 #include "sync/internal_api/public/read_transaction.h"	36 #include "sync/internal_api/public/read_transaction.h"

35 #include "sync/internal_api/public/syncable/model_type.h"

36 #include "sync/internal_api/public/syncable/model_type_payload_map.h"

37 #include "sync/internal_api/public/user_share.h"	37 #include "sync/internal_api/public/user_share.h"

38 #include "sync/internal_api/public/util/experiments.h"	38 #include "sync/internal_api/public/util/experiments.h"

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

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

41 #include "sync/internal_api/syncapi_internal.h"	41 #include "sync/internal_api/syncapi_internal.h"

42 #include "sync/internal_api/syncapi_server_connection_manager.h"	42 #include "sync/internal_api/syncapi_server_connection_manager.h"

43 #include "sync/js/js_arg_list.h"	43 #include "sync/js/js_arg_list.h"

44 #include "sync/js/js_backend.h"	44 #include "sync/js/js_backend.h"

45 #include "sync/js/js_event_details.h"	45 #include "sync/js/js_event_details.h"

46 #include "sync/js/js_event_handler.h"	46 #include "sync/js/js_event_handler.h"

(...skipping 2426 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2473 share->directory->GetDownloadProgress(i.Get(), &marker);	2473 share->directory->GetDownloadProgress(i.Get(), &marker);

2474	2474

2475 if (marker.token().empty())	2475 if (marker.token().empty())

2476 result.Put(i.Get());	2476 result.Put(i.Get());

2477	2477

2478 }	2478 }

2479 return result;	2479 return result;

2480 }	2480 }

2481	2481

2482 } // namespace syncer	2482 } // namespace syncer

OLD	NEW