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

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

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 8 years, 5 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/build_commit_command.cc ('k') | sync/engine/conflict_resolver.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 "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/write_transaction.h"
15 15
16 using syncable::SYNCER;
17 using syncable::WriteTransaction;
18
19 namespace syncer { 16 namespace syncer {
20 17
21 using sessions::SyncSession; 18 using sessions::SyncSession;
22 using sessions::StatusController; 19 using sessions::StatusController;
20 using syncable::SYNCER;
21 using syncable::WriteTransaction;
23 22
24 namespace { 23 namespace {
25 24
26 // Sets the SYNCING bits of all items in the commit set to value_to_set. 25 // Sets the SYNCING bits of all items in the commit set to value_to_set.
27 void SetAllSyncingBitsToValue(WriteTransaction* trans, 26 void SetAllSyncingBitsToValue(WriteTransaction* trans,
28 const sessions::OrderedCommitSet& commit_set, 27 const sessions::OrderedCommitSet& commit_set,
29 bool value_to_set) { 28 bool value_to_set) {
30 const std::vector<syncable::Id>& commit_ids = commit_set.GetAllCommitIds(); 29 const std::vector<syncable::Id>& commit_ids = commit_set.GetAllCommitIds();
31 for (std::vector<syncable::Id>::const_iterator it = commit_ids.begin(); 30 for (std::vector<syncable::Id>::const_iterator it = commit_ids.begin();
32 it != commit_ids.end(); ++it) { 31 it != commit_ids.end(); ++it) {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 sessions::SyncSession* session) { 149 sessions::SyncSession* session) {
151 sessions::OrderedCommitSet commit_set(session->routing_info()); 150 sessions::OrderedCommitSet commit_set(session->routing_info());
152 SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set); 151 SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set);
153 if (result != SYNCER_OK) { 152 if (result != SYNCER_OK) {
154 ClearSyncingBits(session->context()->directory(), commit_set); 153 ClearSyncingBits(session->context()->directory(), commit_set);
155 } 154 }
156 return result; 155 return result;
157 } 156 }
158 157
159 } // namespace syncer 158 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/build_commit_command.cc ('k') | sync/engine/conflict_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698