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

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

Issue 10235013: [Sync] Add support for automatic enabling of syncing tab favicons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert testserver for now Created 8 years, 7 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 | « sync/protocol/nigori_specifics.proto ('k') | sync/sync.gyp » ('j') | 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 "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 SET_BOOL(encrypt_typed_urls); 303 SET_BOOL(encrypt_typed_urls);
304 SET_BOOL(encrypt_extension_settings); 304 SET_BOOL(encrypt_extension_settings);
305 SET_BOOL(encrypt_extensions); 305 SET_BOOL(encrypt_extensions);
306 SET_BOOL(encrypt_sessions); 306 SET_BOOL(encrypt_sessions);
307 SET_BOOL(encrypt_app_settings); 307 SET_BOOL(encrypt_app_settings);
308 SET_BOOL(encrypt_apps); 308 SET_BOOL(encrypt_apps);
309 SET_BOOL(encrypt_search_engines); 309 SET_BOOL(encrypt_search_engines);
310 SET_BOOL(sync_tabs); 310 SET_BOOL(sync_tabs);
311 SET_BOOL(encrypt_everything); 311 SET_BOOL(encrypt_everything);
312 SET_REP(device_information, DeviceInformationToValue); 312 SET_REP(device_information, DeviceInformationToValue);
313 SET_BOOL(sync_tab_favicons);
313 return value; 314 return value;
314 } 315 }
315 316
316 DictionaryValue* PasswordSpecificsToValue( 317 DictionaryValue* PasswordSpecificsToValue(
317 const sync_pb::PasswordSpecifics& proto) { 318 const sync_pb::PasswordSpecifics& proto) {
318 DictionaryValue* value = new DictionaryValue(); 319 DictionaryValue* value = new DictionaryValue();
319 SET(encrypted, EncryptedDataToValue); 320 SET(encrypted, EncryptedDataToValue);
320 return value; 321 return value;
321 } 322 }
322 323
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 #undef SET_BYTES 588 #undef SET_BYTES
588 #undef SET_INT32 589 #undef SET_INT32
589 #undef SET_INT64 590 #undef SET_INT64
590 #undef SET_INT64_REP 591 #undef SET_INT64_REP
591 #undef SET_STR 592 #undef SET_STR
592 #undef SET_STR_REP 593 #undef SET_STR_REP
593 594
594 #undef SET_FIELD 595 #undef SET_FIELD
595 596
596 } // namespace browser_sync 597 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/protocol/nigori_specifics.proto ('k') | sync/sync.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698