summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorbenwells <benwells@chromium.org>2014-12-11 04:38:27 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-11 12:38:52 +0000
commitd4b64a7bf6f7d450e41f5133890cdaebb30623da (patch)
tree6e63062001ca6d7a39182ca0633bac82f517f7b9 /sync
parent206d4d3e569857c3e8f11e4f8364225688ea8507 (diff)
downloadchromium_src-d4b64a7bf6f7d450e41f5133890cdaebb30623da.zip
chromium_src-d4b64a7bf6f7d450e41f5133890cdaebb30623da.tar.gz
chromium_src-d4b64a7bf6f7d450e41f5133890cdaebb30623da.tar.bz2
Ensure there are always nice icons for bookmark apps.
This change does a few things. Firstly, it stops bookmark apps from using downloaded favicons / manifest icons. Secondly, it syncs the color it uses to generate icons. Thirdly, machines that bookmark apps are synced onto will now generate icons using the synced color. This means bookmark apps will always have nice icons (although not the ones downloaded) and they will always be consistent across machines. Once blob sync is available the downloaded icons will be kept and synced. BUG=439347 Review URL: https://codereview.chromium.org/782693002 Cr-Commit-Position: refs/heads/master@{#307889}
Diffstat (limited to 'sync')
-rw-r--r--sync/protocol/app_specifics.proto4
1 files changed, 4 insertions, 0 deletions
diff --git a/sync/protocol/app_specifics.proto b/sync/protocol/app_specifics.proto
index e2f9ef8..a43ea2f 100644
--- a/sync/protocol/app_specifics.proto
+++ b/sync/protocol/app_specifics.proto
@@ -75,4 +75,8 @@ message AppSpecifics {
// This is the description of a bookmark app.
optional string bookmark_app_description = 7;
+
+ // This is the color to use when generating bookmark app icons. The string is
+ // in #rrggbb or #rgb syntax, e.g. #d8d8d8.
+ optional string bookmark_app_icon_color = 8;
}