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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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 | « chrome/browser/sync/internal_api/sync_manager.h ('k') | chrome/browser/sync/internal_api/syncapi_internal.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/sync/internal_api/sync_manager.h" 5 #include "chrome/browser/sync/internal_api/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/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/sync/engine/all_status.h" 19 #include "chrome/browser/sync/internal_api/all_status.h"
20 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 20 #include "chrome/browser/sync/internal_api/syncapi_internal.h"
21 #include "chrome/browser/sync/engine/nigori_util.h"
22 #include "chrome/browser/sync/engine/polling_constants.h"
23 #include "chrome/browser/sync/engine/sync_scheduler.h"
24 #include "chrome/browser/sync/engine/syncapi_internal.h"
25 #include "chrome/browser/sync/engine/syncer_types.h"
26 #include "chrome/browser/sync/internal_api/base_node.h" 21 #include "chrome/browser/sync/internal_api/base_node.h"
27 #include "chrome/browser/sync/internal_api/change_reorder_buffer.h" 22 #include "chrome/browser/sync/internal_api/change_reorder_buffer.h"
28 #include "chrome/browser/sync/internal_api/configure_reason.h" 23 #include "chrome/browser/sync/internal_api/configure_reason.h"
29 #include "chrome/browser/sync/internal_api/debug_info_event_listener.h" 24 #include "chrome/browser/sync/internal_api/debug_info_event_listener.h"
30 #include "chrome/browser/sync/internal_api/read_node.h" 25 #include "chrome/browser/sync/internal_api/read_node.h"
31 #include "chrome/browser/sync/internal_api/read_transaction.h" 26 #include "chrome/browser/sync/internal_api/read_transaction.h"
32 #include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h" 27 #include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h"
33 #include "chrome/browser/sync/internal_api/user_share.h" 28 #include "chrome/browser/sync/internal_api/user_share.h"
34 #include "chrome/browser/sync/internal_api/write_node.h" 29 #include "chrome/browser/sync/internal_api/write_node.h"
35 #include "chrome/browser/sync/internal_api/write_transaction.h" 30 #include "chrome/browser/sync/internal_api/write_transaction.h"
36 #include "chrome/browser/sync/js/js_arg_list.h" 31 #include "chrome/browser/sync/internal_api/js_mutation_event_observer.h"
37 #include "chrome/browser/sync/js/js_backend.h" 32 #include "chrome/browser/sync/internal_api/js_sync_manager_observer.h"
38 #include "chrome/browser/sync/js/js_event_details.h"
39 #include "chrome/browser/sync/js/js_event_handler.h"
40 #include "chrome/browser/sync/js/js_mutation_event_observer.h"
41 #include "chrome/browser/sync/js/js_reply_handler.h"
42 #include "chrome/browser/sync/js/js_sync_manager_observer.h"
43 #include "chrome/browser/sync/notifier/sync_notifier.h" 33 #include "chrome/browser/sync/notifier/sync_notifier.h"
44 #include "chrome/browser/sync/notifier/sync_notifier_observer.h" 34 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
45 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
46 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
47 #include "chrome/browser/sync/syncable/model_type.h"
48 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
49 #include "chrome/browser/sync/syncable/syncable.h"
50 #include "chrome/browser/sync/util/cryptographer.h"
51 #include "chrome/browser/sync/util/get_session_name.h"
52 #include "chrome/browser/sync/util/time.h"
53 #include "net/base/network_change_notifier.h" 35 #include "net/base/network_change_notifier.h"
36 #include "sync/engine/net/server_connection_manager.h"
37 #include "sync/engine/nigori_util.h"
38 #include "sync/engine/polling_constants.h"
39 #include "sync/engine/sync_scheduler.h"
40 #include "sync/engine/syncer_types.h"
41 #include "sync/js/js_arg_list.h"
42 #include "sync/js/js_backend.h"
43 #include "sync/js/js_event_details.h"
44 #include "sync/js/js_event_handler.h"
45 #include "sync/js/js_reply_handler.h"
54 #include "sync/protocol/encryption.pb.h" 46 #include "sync/protocol/encryption.pb.h"
47 #include "sync/protocol/proto_value_conversions.h"
55 #include "sync/protocol/sync.pb.h" 48 #include "sync/protocol/sync.pb.h"
49 #include "sync/syncable/directory_change_delegate.h"
50 #include "sync/syncable/model_type.h"
51 #include "sync/syncable/model_type_payload_map.h"
52 #include "sync/syncable/syncable.h"
53 #include "sync/util/cryptographer.h"
54 #include "sync/util/get_session_name.h"
55 #include "sync/util/time.h"
56 56
57 using base::TimeDelta; 57 using base::TimeDelta;
58 using browser_sync::AllStatus; 58 using browser_sync::AllStatus;
59 using browser_sync::Cryptographer; 59 using browser_sync::Cryptographer;
60 using browser_sync::Encryptor; 60 using browser_sync::Encryptor;
61 using browser_sync::JsArgList; 61 using browser_sync::JsArgList;
62 using browser_sync::JsBackend; 62 using browser_sync::JsBackend;
63 using browser_sync::JsEventDetails; 63 using browser_sync::JsEventDetails;
64 using browser_sync::JsEventHandler; 64 using browser_sync::JsEventHandler;
65 using browser_sync::JsEventHandler; 65 using browser_sync::JsEventHandler;
(...skipping 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 share->directory->GetDownloadProgress(i.Get(), &marker); 2489 share->directory->GetDownloadProgress(i.Get(), &marker);
2490 2490
2491 if (marker.token().empty()) 2491 if (marker.token().empty())
2492 result.Put(i.Get()); 2492 result.Put(i.Get());
2493 2493
2494 } 2494 }
2495 return result; 2495 return result;
2496 } 2496 }
2497 2497
2498 } // namespace sync_api 2498 } // namespace sync_api
OLDNEW
« no previous file with comments | « chrome/browser/sync/internal_api/sync_manager.h ('k') | chrome/browser/sync/internal_api/syncapi_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698