| Index: chrome/browser/sync/engine/resolve_conflicts_command.h
|
| diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.h b/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| index 24075938630e7576ea56d92f816d6b331269d87c..2121a319caa8e86f29e3a4f2ddb1a436c217736f 100644
|
| --- a/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| +++ b/chrome/browser/sync/engine/resolve_conflicts_command.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.
|
|
|
| @@ -21,7 +21,7 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| // ModelChangingSyncerCommand implementation.
|
| virtual std::set<ModelSafeGroup> GetGroupsToChange(
|
| const sessions::SyncSession& session) const OVERRIDE;
|
| - virtual void ModelChangingExecuteImpl(
|
| + virtual SyncerError ModelChangingExecuteImpl(
|
| sessions::SyncSession* session) OVERRIDE;
|
|
|
| private:
|
|
|