OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" | 11 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" |
12 | 12 |
13 namespace browser_sync { | 13 namespace browser_sync { |
14 | 14 |
15 class ResolveConflictsCommand : public ModelChangingSyncerCommand { | 15 class ResolveConflictsCommand : public ModelChangingSyncerCommand { |
16 public: | 16 public: |
17 ResolveConflictsCommand(); | 17 ResolveConflictsCommand(); |
18 virtual ~ResolveConflictsCommand(); | 18 virtual ~ResolveConflictsCommand(); |
19 | 19 |
| 20 protected: |
20 // ModelChangingSyncerCommand implementation. | 21 // ModelChangingSyncerCommand implementation. |
| 22 virtual bool HasCustomGroupsToChange() const OVERRIDE; |
| 23 virtual std::set<ModelSafeGroup> GetGroupsToChange( |
| 24 const sessions::SyncSession& session) const OVERRIDE; |
21 virtual void ModelChangingExecuteImpl( | 25 virtual void ModelChangingExecuteImpl( |
22 sessions::SyncSession* session) OVERRIDE; | 26 sessions::SyncSession* session) OVERRIDE; |
23 | 27 |
24 private: | 28 private: |
25 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); | 29 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); |
26 }; | 30 }; |
27 | 31 |
28 } // namespace browser_sync | 32 } // namespace browser_sync |
29 | 33 |
30 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ | 34 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
OLD | NEW |