sync/engine/syncer.cc - Issue 10823061: Revert 148792 - [Sync] Remove CleanupDisabledTypes command and move purge logic into SyncManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/engine/syncer.cc

Issue 10823061: Revert 148792 - [Sync] Remove CleanupDisabledTypes command and move purge logic into SyncManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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

Index: sync/engine/syncer.cc

===================================================================

--- sync/engine/syncer.cc (revision 148811)

+++ sync/engine/syncer.cc (working copy)

@@ -12,6 +12,7 @@

#include "build/build_config.h"

#include "sync/engine/apply_updates_command.h"

#include "sync/engine/build_commit_command.h"

+#include "sync/engine/cleanup_disabled_types_command.h"

#include "sync/engine/commit.h"

#include "sync/engine/conflict_resolver.h"

#include "sync/engine/download_updates_command.h"

@@ -52,6 +53,7 @@

{

switch (step) {

ENUM_CASE(SYNCER_BEGIN);

+ ENUM_CASE(CLEANUP_DISABLED_TYPES);

ENUM_CASE(DOWNLOAD_UPDATES);

ENUM_CASE(PROCESS_CLIENT_COMMAND);

ENUM_CASE(VERIFY_UPDATES);

@@ -104,8 +106,14 @@

PruneUnthrottledTypes(base::TimeTicks::Now());

session->SendEventNotification(SyncEngineEvent::SYNC_CYCLE_BEGIN);

+ next_step = CLEANUP_DISABLED_TYPES;

+ break;

+ case CLEANUP_DISABLED_TYPES: {

+ CleanupDisabledTypesCommand cleanup;

+ cleanup.Execute(session);

next_step = DOWNLOAD_UPDATES;

break;

+ }

case DOWNLOAD_UPDATES: {

// TODO(akalin): We may want to propagate this switch up

// eventually.

« no previous file with comments | « sync/engine/syncer.h ('k') | sync/internal_api/sync_manager_impl.h » ('j') | no next file with comments »