OLD | NEW |
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/commit.h" | 5 #include "sync/engine/commit.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "sync/engine/build_commit_command.h" | 8 #include "sync/engine/build_commit_command.h" |
9 #include "sync/engine/get_commit_ids_command.h" | 9 #include "sync/engine/get_commit_ids_command.h" |
10 #include "sync/engine/process_commit_response_command.h" | 10 #include "sync/engine/process_commit_response_command.h" |
11 #include "sync/engine/syncer_proto_util.h" | 11 #include "sync/engine/syncer_proto_util.h" |
12 #include "sync/sessions/sync_session.h" | 12 #include "sync/sessions/sync_session.h" |
13 #include "sync/syncable/mutable_entry.h" | 13 #include "sync/syncable/mutable_entry.h" |
14 #include "sync/syncable/write_transaction.h" | 14 #include "sync/syncable/syncable_write_transaction.h" |
15 | 15 |
16 namespace syncer { | 16 namespace syncer { |
17 | 17 |
18 using sessions::SyncSession; | 18 using sessions::SyncSession; |
19 using sessions::StatusController; | 19 using sessions::StatusController; |
20 using syncable::SYNCER; | 20 using syncable::SYNCER; |
21 using syncable::WriteTransaction; | 21 using syncable::WriteTransaction; |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 sessions::SyncSession* session) { | 146 sessions::SyncSession* session) { |
147 sessions::OrderedCommitSet commit_set(session->routing_info()); | 147 sessions::OrderedCommitSet commit_set(session->routing_info()); |
148 SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set); | 148 SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set); |
149 if (result != SYNCER_OK) { | 149 if (result != SYNCER_OK) { |
150 ClearSyncingBits(session->context()->directory(), commit_set); | 150 ClearSyncingBits(session->context()->directory(), commit_set); |
151 } | 151 } |
152 return result; | 152 return result; |
153 } | 153 } |
154 | 154 |
155 } // namespace syncer | 155 } // namespace syncer |
OLD | NEW |