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

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

Issue 395013002: Pass signin_scoped_device_id to DeviceInfoSpecifics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 } 482 }
483 483
484 base::DictionaryValue* DeviceInfoSpecificsToValue( 484 base::DictionaryValue* DeviceInfoSpecificsToValue(
485 const sync_pb::DeviceInfoSpecifics& proto) { 485 const sync_pb::DeviceInfoSpecifics& proto) {
486 base::DictionaryValue* value = new base::DictionaryValue(); 486 base::DictionaryValue* value = new base::DictionaryValue();
487 SET_STR(cache_guid); 487 SET_STR(cache_guid);
488 SET_STR(client_name); 488 SET_STR(client_name);
489 SET_ENUM(device_type, GetDeviceTypeString); 489 SET_ENUM(device_type, GetDeviceTypeString);
490 SET_STR(sync_user_agent); 490 SET_STR(sync_user_agent);
491 SET_STR(chrome_version); 491 SET_STR(chrome_version);
492 SET_STR(signin_scoped_device_id);
492 return value; 493 return value;
493 } 494 }
494 495
495 base::DictionaryValue* DictionarySpecificsToValue( 496 base::DictionaryValue* DictionarySpecificsToValue(
496 const sync_pb::DictionarySpecifics& proto) { 497 const sync_pb::DictionarySpecifics& proto) {
497 base::DictionaryValue* value = new base::DictionaryValue(); 498 base::DictionaryValue* value = new base::DictionaryValue();
498 SET_STR(word); 499 SET_STR(word);
499 return value; 500 return value;
500 } 501 }
501 502
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 #undef SET_BYTES 1110 #undef SET_BYTES
1110 #undef SET_INT32 1111 #undef SET_INT32
1111 #undef SET_INT64 1112 #undef SET_INT64
1112 #undef SET_INT64_REP 1113 #undef SET_INT64_REP
1113 #undef SET_STR 1114 #undef SET_STR
1114 #undef SET_STR_REP 1115 #undef SET_STR_REP
1115 1116
1116 #undef SET_FIELD 1117 #undef SET_FIELD
1117 1118
1118 } // namespace syncer 1119 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698