chrome/browser/sync/glue/theme_change_processor.cc - Issue 10553042: sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

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

Issue 10553042: sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 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/session_change_processor.cc ('k') | chrome/browser/sync/glue/theme_data_type_controller_unittest.cc » ('j') | chrome/browser/sync/glue/ui_data_type_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a2164c345c9c92993f50b2bc8d2693c586a5a8e6..db6d342451abb1a479c8e7cceb2fb8ce32edda79 100644

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

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

@@ -47,7 +47,7 @@ void ThemeChangeProcessor::Observe(

kCurrentThemeClientTag) !=

sync_api::BaseNode::INIT_OK) {

std::string err = "Could not create node with client tag: ";

- error_handler()->OnUnrecoverableError(FROM_HERE,

+ error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,

err + kCurrentThemeClientTag);

return;

}

@@ -92,7 +92,7 @@ void ThemeChangeProcessor::ApplyChangesFromSyncModel(

change.action != sync_api::ChangeRecord::ACTION_DELETE) {

std::string err = "strange theme change.action " +

base::IntToString(change.action);

- error_handler()->OnUnrecoverableError(FROM_HERE, err);

+ error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, err);

return;

}

sync_pb::ThemeSpecifics theme_specifics;