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

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

Issue 8470005: Add OVERRIDE to chrome/browser/sync/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: includes Created 9 years, 1 month 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
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 "chrome/browser/sync/engine/model_changing_syncer_command.h" 11 #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
11 12
12 namespace browser_sync { 13 namespace browser_sync {
13 14
14 class ResolveConflictsCommand : public ModelChangingSyncerCommand { 15 class ResolveConflictsCommand : public ModelChangingSyncerCommand {
15 public: 16 public:
16 ResolveConflictsCommand(); 17 ResolveConflictsCommand();
17 virtual ~ResolveConflictsCommand(); 18 virtual ~ResolveConflictsCommand();
18 19
19 // ModelChangingSyncerCommand implementation. 20 // ModelChangingSyncerCommand implementation.
20 virtual void ModelChangingExecuteImpl(sessions::SyncSession* session); 21 virtual void ModelChangingExecuteImpl(
22 sessions::SyncSession* session) OVERRIDE;
21 23
22 private: 24 private:
23 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand); 25 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
24 }; 26 };
25 27
26 } // namespace browser_sync 28 } // namespace browser_sync
27 29
28 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ 30 #endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/process_updates_command.h ('k') | chrome/browser/sync/engine/store_timestamps_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698