OLD | NEW |
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 "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 SET_STR(originating_url); | 342 SET_STR(originating_url); |
343 SET_INT64(date_created); | 343 SET_INT64(date_created); |
344 SET_STR(input_encodings); | 344 SET_STR(input_encodings); |
345 SET_BOOL(show_in_default_list); | 345 SET_BOOL(show_in_default_list); |
346 SET_STR(suggestions_url); | 346 SET_STR(suggestions_url); |
347 SET_INT32(prepopulate_id); | 347 SET_INT32(prepopulate_id); |
348 SET_BOOL(autogenerate_keyword); | 348 SET_BOOL(autogenerate_keyword); |
349 SET_STR(instant_url); | 349 SET_STR(instant_url); |
350 SET_INT64(last_modified); | 350 SET_INT64(last_modified); |
351 SET_STR(sync_guid); | 351 SET_STR(sync_guid); |
| 352 SET_STR(alternate_urls); |
352 return value; | 353 return value; |
353 } | 354 } |
354 | 355 |
355 DictionaryValue* SessionSpecificsToValue( | 356 DictionaryValue* SessionSpecificsToValue( |
356 const sync_pb::SessionSpecifics& proto) { | 357 const sync_pb::SessionSpecifics& proto) { |
357 DictionaryValue* value = new DictionaryValue(); | 358 DictionaryValue* value = new DictionaryValue(); |
358 SET_STR(session_tag); | 359 SET_STR(session_tag); |
359 SET(header, SessionHeaderToValue); | 360 SET(header, SessionHeaderToValue); |
360 SET(tab, SessionTabToValue); | 361 SET(tab, SessionTabToValue); |
361 SET_INT32(tab_node_id); | 362 SET_INT32(tab_node_id); |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
589 #undef SET_BYTES | 590 #undef SET_BYTES |
590 #undef SET_INT32 | 591 #undef SET_INT32 |
591 #undef SET_INT64 | 592 #undef SET_INT64 |
592 #undef SET_INT64_REP | 593 #undef SET_INT64_REP |
593 #undef SET_STR | 594 #undef SET_STR |
594 #undef SET_STR_REP | 595 #undef SET_STR_REP |
595 | 596 |
596 #undef SET_FIELD | 597 #undef SET_FIELD |
597 | 598 |
598 } // namespace syncer | 599 } // namespace syncer |
OLD | NEW |