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

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

Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, fix test Created 8 years, 7 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/conflict_resolver.cc ('k') | sync/internal_api/all_status.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 (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/syncer_proto_util.h" 5 #include "sync/engine/syncer_proto_util.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "sync/engine/net/server_connection_manager.h" 9 #include "sync/engine/net/server_connection_manager.h"
10 #include "sync/engine/syncer.h" 10 #include "sync/engine/syncer.h"
11 #include "sync/engine/syncer_types.h" 11 #include "sync/engine/syncer_types.h"
12 #include "sync/engine/traffic_logger.h" 12 #include "sync/engine/traffic_logger.h"
13 #include "sync/protocol/service_constants.h"
14 #include "sync/protocol/sync.pb.h" 13 #include "sync/protocol/sync.pb.h"
15 #include "sync/protocol/sync_enums.pb.h" 14 #include "sync/protocol/sync_enums.pb.h"
16 #include "sync/protocol/sync_protocol_error.h" 15 #include "sync/protocol/sync_protocol_error.h"
17 #include "sync/sessions/sync_session.h" 16 #include "sync/sessions/sync_session.h"
18 #include "sync/syncable/model_type.h" 17 #include "sync/syncable/model_type.h"
19 #include "sync/syncable/syncable-inl.h" 18 #include "sync/syncable/syncable-inl.h"
20 #include "sync/syncable/syncable.h" 19 #include "sync/syncable/syncable.h"
21 #include "sync/util/time.h" 20 #include "sync/util/time.h"
22 21
23 using browser_sync::SyncProtocolErrorType; 22 using browser_sync::SyncProtocolErrorType;
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 std::string SyncerProtoUtil::ClientToServerResponseDebugString( 534 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
536 const sync_pb::ClientToServerResponse& response) { 535 const sync_pb::ClientToServerResponse& response) {
537 // Add more handlers as needed. 536 // Add more handlers as needed.
538 std::string output; 537 std::string output;
539 if (response.has_get_updates()) 538 if (response.has_get_updates())
540 output.append(GetUpdatesResponseString(response.get_updates())); 539 output.append(GetUpdatesResponseString(response.get_updates()));
541 return output; 540 return output;
542 } 541 }
543 542
544 } // namespace browser_sync 543 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/engine/conflict_resolver.cc ('k') | sync/internal_api/all_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698