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

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 13947023: Merge 192503 "[Sync] Fix favicon updates to handle orphan nodes" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1453/src/
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/favicon_cache_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl.cc
===================================================================
--- sync/internal_api/sync_manager_impl.cc (revision 193186)
+++ sync/internal_api/sync_manager_impl.cc (working copy)
@@ -121,6 +121,8 @@
return ACCOMPANY_ONLY;
case PREFERENCES:
case SESSIONS:
+ case FAVICON_IMAGES:
+ case FAVICON_TRACKING:
return CUSTOM;
default:
return IMMEDIATE;
@@ -148,6 +150,8 @@
kPreferencesNudgeDelayMilliseconds);
break;
case SESSIONS:
+ case FAVICON_IMAGES:
+ case FAVICON_TRACKING:
delay = core->scheduler()->GetSessionsCommitDelay();
break;
default:
« no previous file with comments | « chrome/browser/sync/glue/favicon_cache_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698