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

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

Issue 10917246: [Sync] Add keystore encryption info to about:sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + address comments Created 8 years, 3 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
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 "google_apis/google_api_keys.h" 9 #include "google_apis/google_api_keys.h"
10 #include "sync/engine/net/server_connection_manager.h" 10 #include "sync/engine/net/server_connection_manager.h"
11 #include "sync/engine/syncer.h" 11 #include "sync/engine/syncer.h"
12 #include "sync/engine/syncer_types.h" 12 #include "sync/engine/syncer_types.h"
13 #include "sync/engine/throttled_data_type_tracker.h" 13 #include "sync/engine/throttled_data_type_tracker.h"
14 #include "sync/engine/traffic_logger.h" 14 #include "sync/engine/traffic_logger.h"
15 #include "sync/internal_api/public/base/model_type.h" 15 #include "sync/internal_api/public/base/model_type.h"
16 #include "sync/internal_api/public/util/time.h"
16 #include "sync/protocol/sync.pb.h" 17 #include "sync/protocol/sync.pb.h"
17 #include "sync/protocol/sync_enums.pb.h" 18 #include "sync/protocol/sync_enums.pb.h"
18 #include "sync/protocol/sync_protocol_error.h" 19 #include "sync/protocol/sync_protocol_error.h"
19 #include "sync/sessions/sync_session.h" 20 #include "sync/sessions/sync_session.h"
20 #include "sync/syncable/directory.h" 21 #include "sync/syncable/directory.h"
21 #include "sync/syncable/entry.h" 22 #include "sync/syncable/entry.h"
22 #include "sync/syncable/syncable-inl.h" 23 #include "sync/syncable/syncable-inl.h"
23 #include "sync/syncable/syncable_proto_util.h" 24 #include "sync/syncable/syncable_proto_util.h"
24 #include "sync/util/time.h"
25 25
26 using std::string; 26 using std::string;
27 using std::stringstream; 27 using std::stringstream;
28 using sync_pb::ClientToServerMessage; 28 using sync_pb::ClientToServerMessage;
29 using sync_pb::ClientToServerResponse; 29 using sync_pb::ClientToServerResponse;
30 30
31 namespace syncer { 31 namespace syncer {
32 32
33 using sessions::SyncSession; 33 using sessions::SyncSession;
34 using syncable::BASE_VERSION; 34 using syncable::BASE_VERSION;
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 std::string SyncerProtoUtil::ClientToServerResponseDebugString( 597 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
598 const ClientToServerResponse& response) { 598 const ClientToServerResponse& response) {
599 // Add more handlers as needed. 599 // Add more handlers as needed.
600 std::string output; 600 std::string output;
601 if (response.has_get_updates()) 601 if (response.has_get_updates())
602 output.append(GetUpdatesResponseString(response.get_updates())); 602 output.append(GetUpdatesResponseString(response.get_updates()));
603 return output; 603 return output;
604 } 604 }
605 605
606 } // namespace syncer 606 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698