summaryrefslogtreecommitdiffstats
path: root/sync/protocol
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 23:13:59 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 23:13:59 +0000
commit75fc37186f94b927401d739deaf89ad31926331b (patch)
tree0859390aa284accfb78adc3d230665381bda48ea /sync/protocol
parente7a7e4127d780e19d4a53d52e1bdeb1f5f1f7003 (diff)
downloadchromium_src-75fc37186f94b927401d739deaf89ad31926331b.zip
chromium_src-75fc37186f94b927401d739deaf89ad31926331b.tar.gz
chromium_src-75fc37186f94b927401d739deaf89ad31926331b.tar.bz2
[Sync] Create FaviconCache
The FaviconCache contains the favicon loading, tracking, and storing logic which will eventually become the favicons datatype. Currently, the session model associator informs it of navigations that access favicons, letting the favicon cache track the recency of favicons based on visit time. Additionally, tab sync now syncs the favicon url for all navigations, which the favicon cache consumes to maintain a page to favicon url mapping. Lastly, the favicon cache supports loading and storing multiple favicon resolutions. BUG=154886 Review URL: https://codereview.chromium.org/12313047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
-rw-r--r--sync/protocol/proto_value_conversions.cc1
-rw-r--r--sync/protocol/session_specifics.proto4
2 files changed, 5 insertions, 0 deletions
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index bc5b0ae..648e1fc 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -186,6 +186,7 @@ base::DictionaryValue* TabNavigationToValue(
SET_BOOL(navigation_chain_end);
SET_INT64(global_id);
SET_STR(search_terms);
+ SET_STR(favicon_url);
return value;
}
diff --git a/sync/protocol/session_specifics.proto b/sync/protocol/session_specifics.proto
index 88e923b0..707e24c 100644
--- a/sync/protocol/session_specifics.proto
+++ b/sync/protocol/session_specifics.proto
@@ -69,6 +69,8 @@ message SessionTab {
optional string extension_app_id = 6;
// Tabs are navigated, and the navigation data is here.
repeated TabNavigation navigation = 7;
+
+ // Fields 8 through 11 are deprecated.
// The favicon for the current url the tab is displaying. Either empty
// or a valid PNG encoded favicon.
optional bytes favicon = 8;
@@ -120,4 +122,6 @@ message TabNavigation {
optional int64 global_id = 15;
// Search terms extracted from the URL.
optional string search_terms = 16;
+ // The favicon url associated with this page.
+ optional string favicon_url = 17;
}