Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: chrome/browser/sync/glue/browser_thread_model_worker.h

Issue 9113024: Add return values to SyncerCommand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move syncer_error.* to internal_api/includes Created 8 years, 11 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/browser_thread_model_worker.h
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.h b/chrome/browser/sync/glue/browser_thread_model_worker.h
index 6447b7fb01e8075bcca6310e33241c5f76b1e5eb..b053fa61cbb82725fd419147dc6c52bf1aa9cfa4 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker.h
+++ b/chrome/browser/sync/glue/browser_thread_model_worker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,7 +10,7 @@
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "chrome/browser/sync/engine/model_safe_worker.h"
-#include "chrome/browser/sync/util/unrecoverable_error_info.h"
+#include "chrome/browser/sync/internal_api/includes/syncer_error.h"
#include "content/public/browser/browser_thread.h"
namespace base {
@@ -29,7 +29,7 @@ class BrowserThreadModelWorker : public ModelSafeWorker {
virtual ~BrowserThreadModelWorker();
// ModelSafeWorker implementation. Called on the sync thread.
- virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
+ virtual SyncerError DoWorkAndWaitUntilDone(
const WorkCallback& work) OVERRIDE;
virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
@@ -40,7 +40,7 @@ class BrowserThreadModelWorker : public ModelSafeWorker {
virtual void CallDoWorkAndSignalTask(
const WorkCallback& work,
base::WaitableEvent* done,
- UnrecoverableErrorInfo* error_info) = 0;
+ SyncerError* error) = 0;
private:
content::BrowserThread::ID thread_;
@@ -61,7 +61,7 @@ class DatabaseModelWorker : public BrowserThreadModelWorker {
virtual void CallDoWorkAndSignalTask(
const WorkCallback& work,
base::WaitableEvent* done,
- UnrecoverableErrorInfo* error_info) OVERRIDE;
+ SyncerError* error) OVERRIDE;
};
class FileModelWorker : public BrowserThreadModelWorker {
@@ -73,7 +73,7 @@ class FileModelWorker : public BrowserThreadModelWorker {
virtual void CallDoWorkAndSignalTask(
const WorkCallback& work,
base::WaitableEvent* done,
- UnrecoverableErrorInfo* error_info) OVERRIDE;
+ SyncerError* error) OVERRIDE;
};
} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/engine/verify_updates_command.cc ('k') | chrome/browser/sync/glue/browser_thread_model_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698