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 "chrome/browser/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 "chrome/browser/sync/engine/syncer.h" | 11 #include "sync/engine/syncer.h" |
12 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 12 #include "sync/engine/syncer_proto_util.h" |
13 #include "chrome/browser/sync/engine/syncer_util.h" | 13 #include "sync/engine/syncer_util.h" |
14 #include "chrome/browser/sync/engine/syncproto.h" | 14 #include "sync/engine/syncproto.h" |
15 #include "chrome/browser/sync/sessions/sync_session.h" | 15 #include "sync/sessions/sync_session.h" |
16 #include "chrome/browser/sync/syncable/syncable.h" | 16 #include "sync/syncable/syncable.h" |
17 #include "chrome/browser/sync/util/cryptographer.h" | 17 #include "sync/util/cryptographer.h" |
18 | 18 |
19 using std::vector; | 19 using std::vector; |
20 | 20 |
21 namespace browser_sync { | 21 namespace browser_sync { |
22 | 22 |
23 using sessions::SyncSession; | 23 using sessions::SyncSession; |
24 using sessions::StatusController; | 24 using sessions::StatusController; |
25 using sessions::UpdateProgress; | 25 using sessions::UpdateProgress; |
26 | 26 |
27 ProcessUpdatesCommand::ProcessUpdatesCommand() {} | 27 ProcessUpdatesCommand::ProcessUpdatesCommand() {} |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 target_entry.Put(syncable::BASE_SERVER_SPECIFICS, | 174 target_entry.Put(syncable::BASE_SERVER_SPECIFICS, |
175 sync_pb::EntitySpecifics()); | 175 sync_pb::EntitySpecifics()); |
176 } | 176 } |
177 | 177 |
178 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name); | 178 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name); |
179 | 179 |
180 return SUCCESS_PROCESSED; | 180 return SUCCESS_PROCESSED; |
181 } | 181 } |
182 | 182 |
183 } // namespace browser_sync | 183 } // namespace browser_sync |
OLD | NEW |