diff options
author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:26:55 +0000 |
---|---|---|
committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:26:55 +0000 |
commit | fdf4e2506a6dc6fc6d102e72c58511aa1bcfd9ac (patch) | |
tree | e0d26487de15eebc1e602318d1ccf84e1e07c8bd /sync/protocol | |
parent | c423cb934ddb53672b4d1b15ede1bece0a715fee (diff) | |
download | chromium_src-fdf4e2506a6dc6fc6d102e72c58511aa1bcfd9ac.zip chromium_src-fdf4e2506a6dc6fc6d102e72c58511aa1bcfd9ac.tar.gz chromium_src-fdf4e2506a6dc6fc6d102e72c58511aa1bcfd9ac.tar.bz2 |
[Sync] Add support for automatic enabling of syncing tab favicons.
We add the sync_tab_favicons field to the nigori node and add support
for automatically enabling the feature when we receive a new nigori node.
Once we do enable the feature, the browser will only start writing favicons
after the next restart.
BUG=92728
TEST=using python testserver to enable sync tab favicons, then restarting.
Review URL: http://codereview.chromium.org/10235013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
-rw-r--r-- | sync/protocol/nigori_specifics.proto | 3 | ||||
-rw-r--r-- | sync/protocol/proto_value_conversions.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sync/protocol/nigori_specifics.proto b/sync/protocol/nigori_specifics.proto index 50f5014..8a0effd 100644 --- a/sync/protocol/nigori_specifics.proto +++ b/sync/protocol/nigori_specifics.proto @@ -90,5 +90,8 @@ message NigoriSpecifics { // User device information. Contains information about each device that has a // sync-enabled Chrome browser connected to the user account. repeated DeviceInformation device_information = 28; + + // Enable syncing favicons as part of tab sync. + optional bool sync_tab_favicons = 29; } diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index 70b3ea1..cb4b1e33 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -310,6 +310,7 @@ DictionaryValue* NigoriSpecificsToValue( SET_BOOL(sync_tabs); SET_BOOL(encrypt_everything); SET_REP(device_information, DeviceInformationToValue); + SET_BOOL(sync_tab_favicons); return value; } |