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

Side by Side Diff: sync/engine/process_updates_command.cc

Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove comments Created 8 years 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/process_commit_response_command_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('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 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/engine/process_updates_command.h" 5 #include "sync/engine/process_updates_command.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "sync/engine/syncer.h" 11 #include "sync/engine/syncer.h"
12 #include "sync/engine/syncer_proto_util.h" 12 #include "sync/engine/syncer_proto_util.h"
13 #include "sync/engine/syncer_util.h" 13 #include "sync/engine/syncer_util.h"
14 #include "sync/sessions/sync_session.h" 14 #include "sync/sessions/sync_session.h"
15 #include "sync/syncable/directory.h" 15 #include "sync/syncable/directory.h"
16 #include "sync/syncable/mutable_entry.h" 16 #include "sync/syncable/mutable_entry.h"
17 #include "sync/syncable/syncable_proto_util.h" 17 #include "sync/syncable/syncable_proto_util.h"
18 #include "sync/syncable/syncable_util.h" 18 #include "sync/syncable/syncable_util.h"
19 #include "sync/syncable/write_transaction.h" 19 #include "sync/syncable/syncable_write_transaction.h"
20 #include "sync/util/cryptographer.h" 20 #include "sync/util/cryptographer.h"
21 21
22 // TODO(vishwath): Remove this include after node positions have 22 // TODO(vishwath): Remove this include after node positions have
23 // shifted to completely using Ordinals. 23 // shifted to completely using Ordinals.
24 // See http://crbug.com/145412 . 24 // See http://crbug.com/145412 .
25 #include "sync/internal_api/public/base/node_ordinal.h" 25 #include "sync/internal_api/public/base/node_ordinal.h"
26 26
27 using std::vector; 27 using std::vector;
28 28
29 namespace syncer { 29 namespace syncer {
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 target_entry.Put(syncable::BASE_SERVER_SPECIFICS, 343 target_entry.Put(syncable::BASE_SERVER_SPECIFICS,
344 sync_pb::EntitySpecifics()); 344 sync_pb::EntitySpecifics());
345 } 345 }
346 346
347 UpdateServerFieldsFromUpdate(&target_entry, update, name); 347 UpdateServerFieldsFromUpdate(&target_entry, update, name);
348 348
349 return SUCCESS_PROCESSED; 349 return SUCCESS_PROCESSED;
350 } 350 }
351 351
352 } // namespace syncer 352 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/process_commit_response_command_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698