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

Side by Side Diff: chrome/browser/sync/engine/resolve_conflicts_command.h

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
6 #define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
7 #pragma once
8
9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h"
11 #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
12
13 namespace browser_sync {
14
15 class ResolveConflictsCommand : public ModelChangingSyncerCommand {
16 public:
17 ResolveConflictsCommand();
18 virtual ~ResolveConflictsCommand();
19
20 protected:
21 // ModelChangingSyncerCommand implementation.
22 virtual std::set<ModelSafeGroup> GetGroupsToChange(
23 const sessions::SyncSession& session) const OVERRIDE;
24 virtual SyncerError ModelChangingExecuteImpl(
25 sessions::SyncSession* session) OVERRIDE;
26
27 private:
28 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
29 };
30
31 } // namespace browser_sync
32
33 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698