chrome/browser/sync/glue/non_frontend_data_type_controller.cc - Issue 15701022: [Sync] Add support for sync Persistence Errors

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/non_frontend_data_type_controller.cc

Issue 15701022: [Sync] Add support for sync Persistence Errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move bookmark change into separate patch Created 7 years, 6 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/model_association_manager_unittest.cc ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.cc

diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

index 1ff03e4ccf841624bfe52943e38419da3bdba5a7..56a07f352127e71ffb6bfa4f97607de1431da29a 100644

--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

@@ -48,7 +48,9 @@ void NonFrontendDataTypeController::LoadModels(

start_association_called_.Reset();

start_models_failed_ = false;

if (state_ != NOT_RUNNING) {

- model_load_callback.Run(type(), syncer::SyncError(FROM_HERE,

+ model_load_callback.Run(type(),

+ syncer::SyncError(FROM_HERE,

+ syncer::SyncError::DATATYPE_ERROR,

"Model already loaded",

type()));

return;

@@ -63,7 +65,9 @@ void NonFrontendDataTypeController::LoadModels(

// get a false it means they failed.

DCHECK(state_ == NOT_RUNNING || state_ == MODEL_STARTING

|| state_ == DISABLED);

- model_load_callback.Run(type(), syncer::SyncError(FROM_HERE,

+ model_load_callback.Run(type(),

+ syncer::SyncError(FROM_HERE,

+ syncer::SyncError::DATATYPE_ERROR,

"Failed loading",

type()));

return;

@@ -88,7 +92,9 @@ void NonFrontendDataTypeController::StartAssociating(

start_callback_ = start_callback;

if (!StartAssociationAsync()) {

syncer::SyncError error(

- FROM_HERE, "Failed to post StartAssociation", type());

+ FROM_HERE,

+ syncer::SyncError::DATATYPE_ERROR,

+ "Failed to post StartAssociation", type());

syncer::SyncMergeResult local_merge_result(type());

local_merge_result.set_error(error);

StartDoneImpl(ASSOCIATION_FAILED,

@@ -418,7 +424,10 @@ void NonFrontendDataTypeController::StartAssociation() {

bool sync_has_nodes = false;

if (!model_associator_->SyncModelHasUserCreatedNodes(&sync_has_nodes)) {

- syncer::SyncError error(FROM_HERE, "Failed to load sync nodes", type());

+ syncer::SyncError error(FROM_HERE,

+ syncer::SyncError::UNRECOVERABLE_ERROR,

+ "Failed to load sync nodes",

+ type());

local_merge_result.set_error(error);

StartDone(UNRECOVERABLE_ERROR,

local_merge_result,