chrome/browser/sync/glue/data_type_manager_impl.cc - Issue 7545012: Merge 94530 - [Sync] Add RequestCleanupDisabledTypes() method to 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: chrome/browser/sync/glue/data_type_manager_impl.cc

Issue 7545012: Merge 94530 - [Sync] Add RequestCleanupDisabledTypes() method to SyncManager (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 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: chrome/browser/sync/glue/data_type_manager_impl.cc

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

--- chrome/browser/sync/glue/data_type_manager_impl.cc (revision 94934)

+++ chrome/browser/sync/glue/data_type_manager_impl.cc (working copy)

@@ -218,7 +218,7 @@

}

void DataTypeManagerImpl::DownloadReady(bool success) {

- DCHECK(state_ == DOWNLOAD_PENDING);

+ DCHECK_EQ(state_, DOWNLOAD_PENDING);

if (!success) {

NotifyDone(UNRECOVERABLE_ERROR, FROM_HERE);

@@ -376,7 +376,8 @@

}

void DataTypeManagerImpl::FinishStop() {

- DCHECK(state_== CONFIGURING || state_ == STOPPING || state_ == BLOCKED);

+ DCHECK(state_== CONFIGURING || state_ == STOPPING || state_ == BLOCKED ||

+ state_ == DOWNLOAD_PENDING);

// Simply call the Stop() method on all running data types.

for (DataTypeController::TypeMap::const_iterator it = controllers_.begin();

it != controllers_.end(); ++it) {

« no previous file with comments | « chrome/browser/sync/engine/syncer.cc ('k') | chrome/browser/sync/glue/sync_backend_host.h » ('j') | no next file with comments »