Chromium Code Reviews| Index: sync/engine/apply_updates_and_resolve_conflicts_command.h |
| diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command.h b/sync/engine/apply_updates_and_resolve_conflicts_command.h |
| index 9c015b91da00ee56414e35f371a1416db84ee52b..0ce92b9b3c95e45aa1a426883a07405ba7802db8 100644 |
| --- a/sync/engine/apply_updates_and_resolve_conflicts_command.h |
| +++ b/sync/engine/apply_updates_and_resolve_conflicts_command.h |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +// Copyright 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. |
| @@ -6,13 +6,15 @@ |
| #define SYNC_ENGINE_APPLY_UPDATES_AND_RESOLVE_CONFLICTS_COMMAND_H_ |
| #include "base/compiler_specific.h" |
| +#include "sync/base/sync_export.h" |
| #include "sync/engine/model_changing_syncer_command.h" |
| namespace syncer { |
| -class ApplyUpdatesAndResolveConflictsCommand |
| +class SYNC_EXPORT_PRIVATE ApplyUpdatesAndResolveConflictsCommand |
| : public ModelChangingSyncerCommand { |
| public: |
| + friend class ApplyUpdatesAndResolveConflictsCommandTest; |
|
akalin
2012/12/27 19:48:52
out of curiosity, why did this end up being needed
Raghu Simha
2013/01/02 06:49:24
Good question. Turns out it isn't necessary after
|
| ApplyUpdatesAndResolveConflictsCommand(); |
| virtual ~ApplyUpdatesAndResolveConflictsCommand(); |