OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/protocol/proto_value_conversions.h" | 7 #include "chrome/browser/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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 SET_STR(input_encodings); | 276 SET_STR(input_encodings); |
277 SET_BOOL(show_in_default_list); | 277 SET_BOOL(show_in_default_list); |
278 SET_STR(suggestions_url); | 278 SET_STR(suggestions_url); |
279 SET_INT32(prepopulate_id); | 279 SET_INT32(prepopulate_id); |
280 SET_BOOL(autogenerate_keyword); | 280 SET_BOOL(autogenerate_keyword); |
281 SET_INT32(logo_id); | 281 SET_INT32(logo_id); |
282 SET_BOOL(created_by_policy); | 282 SET_BOOL(created_by_policy); |
283 SET_STR(instant_url); | 283 SET_STR(instant_url); |
284 SET_INT64(id); | 284 SET_INT64(id); |
285 SET_INT64(last_modified); | 285 SET_INT64(last_modified); |
| 286 SET_STR(sync_guid); |
286 return value; | 287 return value; |
287 } | 288 } |
288 | 289 |
289 DictionaryValue* SessionSpecificsToValue( | 290 DictionaryValue* SessionSpecificsToValue( |
290 const sync_pb::SessionSpecifics& proto) { | 291 const sync_pb::SessionSpecifics& proto) { |
291 DictionaryValue* value = new DictionaryValue(); | 292 DictionaryValue* value = new DictionaryValue(); |
292 SET_STR(session_tag); | 293 SET_STR(session_tag); |
293 SET(header, SessionHeaderToValue); | 294 SET(header, SessionHeaderToValue); |
294 SET(tab, SessionTabToValue); | 295 SET(tab, SessionTabToValue); |
295 return value; | 296 return value; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 #undef SET_BOOL | 342 #undef SET_BOOL |
342 #undef SET_BYTES | 343 #undef SET_BYTES |
343 #undef SET_INT32 | 344 #undef SET_INT32 |
344 #undef SET_INT64 | 345 #undef SET_INT64 |
345 #undef SET_INT64_REP | 346 #undef SET_INT64_REP |
346 #undef SET_STR | 347 #undef SET_STR |
347 | 348 |
348 #undef SET_EXTENSION | 349 #undef SET_EXTENSION |
349 | 350 |
350 } // namespace browser_sync | 351 } // namespace browser_sync |
OLD | NEW |