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

Side by Side Diff: trunk/src/sync/protocol/proto_value_conversions.cc

Issue 398273006: Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/sync/protocol/device_info_specifics.proto ('k') | no next file » | 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 // Keep this file in sync with the .proto files in this directory. 5 // Keep this file in sync with the .proto files in this directory.
6 6
7 #include "sync/protocol/proto_value_conversions.h" 7 #include "sync/protocol/proto_value_conversions.h"
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 492
493 base::DictionaryValue* DeviceInfoSpecificsToValue( 493 base::DictionaryValue* DeviceInfoSpecificsToValue(
494 const sync_pb::DeviceInfoSpecifics& proto) { 494 const sync_pb::DeviceInfoSpecifics& proto) {
495 base::DictionaryValue* value = new base::DictionaryValue(); 495 base::DictionaryValue* value = new base::DictionaryValue();
496 SET_STR(cache_guid); 496 SET_STR(cache_guid);
497 SET_STR(client_name); 497 SET_STR(client_name);
498 SET_ENUM(device_type, GetDeviceTypeString); 498 SET_ENUM(device_type, GetDeviceTypeString);
499 SET_STR(sync_user_agent); 499 SET_STR(sync_user_agent);
500 SET_STR(chrome_version); 500 SET_STR(chrome_version);
501 SET_TIME_STR(backup_timestamp); 501 SET_TIME_STR(backup_timestamp);
502 SET_STR(signin_scoped_device_id);
503 return value; 502 return value;
504 } 503 }
505 504
506 base::DictionaryValue* DictionarySpecificsToValue( 505 base::DictionaryValue* DictionarySpecificsToValue(
507 const sync_pb::DictionarySpecifics& proto) { 506 const sync_pb::DictionarySpecifics& proto) {
508 base::DictionaryValue* value = new base::DictionaryValue(); 507 base::DictionaryValue* value = new base::DictionaryValue();
509 SET_STR(word); 508 SET_STR(word);
510 return value; 509 return value;
511 } 510 }
512 511
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 #undef SET_BYTES 1121 #undef SET_BYTES
1123 #undef SET_INT32 1122 #undef SET_INT32
1124 #undef SET_INT64 1123 #undef SET_INT64
1125 #undef SET_INT64_REP 1124 #undef SET_INT64_REP
1126 #undef SET_STR 1125 #undef SET_STR
1127 #undef SET_STR_REP 1126 #undef SET_STR_REP
1128 1127
1129 #undef SET_FIELD 1128 #undef SET_FIELD
1130 1129
1131 } // namespace syncer 1130 } // namespace syncer
OLDNEW
« no previous file with comments | « trunk/src/sync/protocol/device_info_specifics.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698