| 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
|
| deleted file mode 100644
|
| index 2121a319caa8e86f29e3a4f2ddb1a436c217736f..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| +++ /dev/null
|
| @@ -1,33 +0,0 @@
|
| -// 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.
|
| -
|
| -#ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
|
| -#define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
|
| -#pragma once
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| -#include "chrome/browser/sync/engine/model_changing_syncer_command.h"
|
| -
|
| -namespace browser_sync {
|
| -
|
| -class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| - public:
|
| - ResolveConflictsCommand();
|
| - virtual ~ResolveConflictsCommand();
|
| -
|
| - protected:
|
| - // ModelChangingSyncerCommand implementation.
|
| - virtual std::set<ModelSafeGroup> GetGroupsToChange(
|
| - const sessions::SyncSession& session) const OVERRIDE;
|
| - virtual SyncerError ModelChangingExecuteImpl(
|
| - sessions::SyncSession* session) OVERRIDE;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
|
| -};
|
| -
|
| -} // namespace browser_sync
|
| -
|
| -#endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
|
|
|