chrome/browser/sync/glue/non_frontend_data_type_controller.h - 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/non_frontend_data_type_controller.h

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/new_non_frontend_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller.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/non_frontend_data_type_controller.h

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

index 57efbd8f2a48d3817f78fc009f7c1ee615528630..72144fc0fbcfeac95c624f3942a397a943e93059 100644

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

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

@@ -56,8 +56,6 @@ class NonFrontendDataTypeController : public DataTypeController {

// DataTypeErrorHandler interface.

// Note: this is performed on the datatype's thread.

- virtual void OnUnrecoverableError(const tracked_objects::Location& from_here,

- const std::string& message) OVERRIDE;

virtual void OnSingleDatatypeUnrecoverableError(

const tracked_objects::Location& from_here,

const std::string& message) OVERRIDE;

@@ -115,11 +113,6 @@ class NonFrontendDataTypeController : public DataTypeController {

// Note: this is performed on the frontend (UI) thread.

virtual void StopModels();

- // Implementation of OnUnrecoverableError that lives on UI thread.

- virtual void OnUnrecoverableErrorImpl(

- const tracked_objects::Location& from_here,

- const std::string& message);

// The actual implementation of Disabling the datatype. This happens

// on the UI thread.

virtual void DisableImpl(const tracked_objects::Location& from_here,