chrome/browser/sync/glue/history_model_worker.h - Issue 8366030: Introduce the plumbing necessary to report Unrecoverable error from model safe workers.

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/history_model_worker.h

Issue 8366030: Introduce the plumbing necessary to report Unrecoverable error from model safe workers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 2 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

« chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc ('K') | « chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc ('k') | chrome/browser/sync/glue/history_model_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/history_model_worker.h

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

index ccf1b04207cca49a6c62b63483c7abbfdd1dff08..ad0df5c0a0b5bc613e3642227faf16170d340897 100644

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

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

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

#pragma once

#include "chrome/browser/sync/engine/model_safe_worker.h"

+#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"

#include "base/basictypes.h"

#include "base/callback.h"

@@ -29,8 +30,9 @@ class HistoryModelWorker : public browser_sync::ModelSafeWorker {

virtual ~HistoryModelWorker();

// ModelSafeWorker implementation. Called on syncapi SyncerThread.

- virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);

- virtual ModelSafeGroup GetModelSafeGroup();

+ virtual sessions::UnrecoverableErrorInfo DoWorkAndWaitUntilDone(

+ const WorkCallback& work) OVERRIDE;

+ virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;

private:

scoped_refptr<HistoryService> history_service_;