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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: sync/engine/syncer.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 | « sync/engine/syncer.h ('k') | sync/engine/syncer_command.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/engine/syncer.h" 5 #include "sync/engine/syncer.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/time.h" 11 #include "base/time.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/sync/engine/apply_updates_command.h" 13 #include "sync/engine/apply_updates_command.h"
14 #include "chrome/browser/sync/engine/build_commit_command.h" 14 #include "sync/engine/build_commit_command.h"
15 #include "chrome/browser/sync/engine/cleanup_disabled_types_command.h" 15 #include "sync/engine/cleanup_disabled_types_command.h"
16 #include "chrome/browser/sync/engine/clear_data_command.h" 16 #include "sync/engine/clear_data_command.h"
17 #include "chrome/browser/sync/engine/conflict_resolver.h" 17 #include "sync/engine/conflict_resolver.h"
18 #include "chrome/browser/sync/engine/download_updates_command.h" 18 #include "sync/engine/download_updates_command.h"
19 #include "chrome/browser/sync/engine/get_commit_ids_command.h" 19 #include "sync/engine/get_commit_ids_command.h"
20 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 20 #include "sync/engine/net/server_connection_manager.h"
21 #include "chrome/browser/sync/engine/post_commit_message_command.h" 21 #include "sync/engine/post_commit_message_command.h"
22 #include "chrome/browser/sync/engine/process_commit_response_command.h" 22 #include "sync/engine/process_commit_response_command.h"
23 #include "chrome/browser/sync/engine/process_updates_command.h" 23 #include "sync/engine/process_updates_command.h"
24 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" 24 #include "sync/engine/resolve_conflicts_command.h"
25 #include "chrome/browser/sync/engine/store_timestamps_command.h" 25 #include "sync/engine/store_timestamps_command.h"
26 #include "chrome/browser/sync/engine/syncer_types.h" 26 #include "sync/engine/syncer_types.h"
27 #include "chrome/browser/sync/engine/syncproto.h" 27 #include "sync/engine/syncproto.h"
28 #include "chrome/browser/sync/engine/verify_updates_command.h" 28 #include "sync/engine/verify_updates_command.h"
29 #include "chrome/browser/sync/syncable/syncable-inl.h" 29 #include "sync/syncable/syncable-inl.h"
30 #include "chrome/browser/sync/syncable/syncable.h" 30 #include "sync/syncable/syncable.h"
31 31
32 using base::Time; 32 using base::Time;
33 using base::TimeDelta; 33 using base::TimeDelta;
34 using sync_pb::ClientCommand; 34 using sync_pb::ClientCommand;
35 using syncable::Blob; 35 using syncable::Blob;
36 using syncable::IS_UNAPPLIED_UPDATE; 36 using syncable::IS_UNAPPLIED_UPDATE;
37 using syncable::SERVER_CTIME; 37 using syncable::SERVER_CTIME;
38 using syncable::SERVER_IS_DEL; 38 using syncable::SERVER_IS_DEL;
39 using syncable::SERVER_IS_DIR; 39 using syncable::SERVER_IS_DIR;
40 using syncable::SERVER_MTIME; 40 using syncable::SERVER_MTIME;
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 entry->Put(SERVER_CTIME, Time()); 336 entry->Put(SERVER_CTIME, Time());
337 entry->Put(SERVER_VERSION, 0); 337 entry->Put(SERVER_VERSION, 0);
338 entry->Put(SERVER_IS_DIR, false); 338 entry->Put(SERVER_IS_DIR, false);
339 entry->Put(SERVER_IS_DEL, false); 339 entry->Put(SERVER_IS_DEL, false);
340 entry->Put(IS_UNAPPLIED_UPDATE, false); 340 entry->Put(IS_UNAPPLIED_UPDATE, false);
341 entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance()); 341 entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance());
342 entry->Put(SERVER_POSITION_IN_PARENT, 0); 342 entry->Put(SERVER_POSITION_IN_PARENT, 0);
343 } 343 }
344 344
345 } // namespace browser_sync 345 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/engine/syncer.h ('k') | sync/engine/syncer_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698